diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 36688a74..268905e1 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -385,9 +385,9 @@ doScratchpad = deactivateFullAnd . namedScratchpadAction scratchpads
 
 -- Raise or spawn
 
-myRaiseNextMaybe = (maybeUnminimizeClassAfter .) .
+myRaiseNextMaybe = ((deactivateFullAnd . maybeUnminimizeClassAfter) .) .
                    raiseNextMaybeCustomFocus greedyFocusWindow
-myBringNextMaybe = (maybeUnminimizeAfter .) .
+myBringNextMaybe = ((deactivateFullAnd . maybeUnminimizeAfter) .) .
                    raiseNextMaybeCustomFocus bringWindow
 
 bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())]