diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index b2d1ea2b..806a9d43 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -432,8 +432,7 @@ maybeUnminimizeClassAfter = (>> maximizeSameClassesInWorkspace)
 sameClassOnly action =
   action >> minimizeOtherClassesInWorkspace >> maximizeSameClassesInWorkspace
 
-restoreAllMinimized = restoreFocus $
-  withLastMinimized $ \w -> maximizeWindow w >> restoreAllMinimized
+restoreAllMinimized = void $ join $ mapM maximizeWindow <$> minimizedWindows
 
 restoreOrMinimizeOtherClasses = null <$> maximizedOtherClass >>=
   ifL restoreAllMinimized minimizeOtherClassesInWorkspace