diff --git a/xmonad.hs b/xmonad.hs
index 7725869..76494c0 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,5 +1,6 @@
 import XMonad
 import XMonad.Actions.CycleWS
+import XMonad.Actions.Minimize(minimizeWindow, withLastMinimized, maximizeWindowAndFocus)
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.ManageHelpers
@@ -56,14 +57,14 @@ workspaceManageHook = composeAll [
     ,className =? "Screenlayout" --> doFloat
     ]
 
-xmobarAction :: String  -- action
+xmobarActionWrapper :: String  -- action
              -> String -- output string
              -> String
-xmobarAction action = wrap t "</action>"
+xmobarActionWrapper action = wrap t "</action>"
     where t = concat ["<action=`", action, "`>"]
 
 xmobarSwitchWs :: String -> String
-xmobarSwitchWs wsName = xmobarAction action wsName
+xmobarSwitchWs wsName = xmobarActionWrapper action wsName
     where action = concat ["xdotool key ISO_Level3_Shift+F", workspace]
           workspace = takeWhile (/=':') wsName -- Takes all chars until ':'
 
@@ -102,7 +103,7 @@ main = do
         , ((modMask baseConfig, xK_s), sshPrompt baseXPConfig)
         -- XMonad.Layout.Minimize
         , ((modMask baseConfig, xK_c), withFocused minimizeWindow)
-        , ((modMask baseConfig, xK_g), sendMessage RestoreNextMinimizedWin)
+        , ((modMask baseConfig, xK_g), withLastMinimized maximizeWindowAndFocus)
         -- XMonad.Layout.BoringWindows
         , ((modMask baseConfig, xK_j), focusUp)
         , ((modMask baseConfig, xK_k), focusDown)