diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index b67e738b..5991606a 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -117,11 +117,11 @@ static void event(ObEvent *e, void *foo)
                 Action *act = it->data;
                 act->data.cycle.final = TRUE;
                 act->func(&act->data);
-                grabbed_key = NULL;
-                grab_keyboard(FALSE);
-                reset_chains();
-                return;
             }
+            grabbed_key = NULL;
+            grab_keyboard(FALSE);
+            reset_chains();
+            return;
         }
     }
     if (e->type == Event_X_KeyRelease)