diff --git a/src/Views/Controls/Window.cs b/src/Views/Controls/Window.cs
index d152630a..24888763 100644
--- a/src/Views/Controls/Window.cs
+++ b/src/Views/Controls/Window.cs
@@ -56,7 +56,7 @@ namespace SourceGit.Views.Controls {
             if (w != null) {
                 if (w.IsMaximized) {
                     SystemCommands.MaximizeWindow(w);
-                } else {
+                } else if (w.WindowState != WindowState.Minimized) {
                     SystemCommands.RestoreWindow(w);
                 }
             }