diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
index aef166657..174c1fe64 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
@@ -11,10 +11,10 @@ public class PushMainWindow2TopCommand : ICommand
 
     public void Execute(object parameter)
     {
-        if (Application.Current.MainWindow != null && Application.Current.MainWindow.Visibility != Visibility.Visible)
+        Window mainWindow = Application.Current.MainWindow;
+        if (mainWindow != null && mainWindow.Visibility != Visibility.Visible || mainWindow.WindowState == WindowState.Minimized)
         {
-            Application.Current.MainWindow.Show();
-            WindowHelper.SetWindowToForeground(Application.Current.MainWindow);
+            WindowHelper.SetWindowToForeground(mainWindow);
         }
     }
 
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index 6bab0d0d9..81e9c9646 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -195,6 +195,7 @@ public static void SetWindowToForeground(Window window)
             window.Topmost = true;
             window.Topmost = false;
         }
+        window.WindowState = WindowState.Normal;
     }
 
     /// <summary>