diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index b5e9efdb..d50038b2 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -288,7 +288,9 @@ swapMinimizeStateAfter action = withFocused $ \originalWindow -> do
       _ <- action
       restoreFocus $ do
         maybeUnminimizeFocused
-        minimizeWindow originalWindow
+        withFocused $ \newWindow -> do
+            when (newWindow /= originalWindow)
+                 $ minimizeWindow originalWindow
 
 -- Raise or spawn