diff --git a/XMonad/Actions/Submap.hs b/XMonad/Actions/Submap.hs
index 8e267210..469f97de 100644
--- a/XMonad/Actions/Submap.hs
+++ b/XMonad/Actions/Submap.hs
@@ -75,7 +75,7 @@ submapDefault def keys = do
             then nextkey
             else return (m, keysym)
 
-    io $ ungrabKeyboard d currentTime
-
     m' <- cleanMask m
     maybe def id (M.lookup (m', s) keys)
+
+    io $ ungrabKeyboard d currentTime