diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index e62cff8a..8c5b5543 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -53,13 +53,13 @@ static void grab_keys(gboolean grab)
         while (p) {
             if (p->key)
                 grab_key(p->key, p->state, RootWindow(ob_display, ob_screen),
-                         GrabModeSync);
+                         GrabModeAsync);
             p = p->next_sibling;
         }
         if (curpos)
             grab_key(config_keyboard_reset_keycode,
                      config_keyboard_reset_state,
-                     RootWindow(ob_display, ob_screen), GrabModeSync);
+                     RootWindow(ob_display, ob_screen), GrabModeAsync);
     }
 }
 
@@ -263,8 +263,6 @@ void keyboard_event(ObClient *client, const XEvent *e)
         }
         p = p->next_sibling;
     }
-
-    XAllowEvents(ob_display, AsyncKeyboard, event_curtime);
 }
 
 static void node_rebind(KeyBindingTree *node)