1 files changed, 7 insertions, 2 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 9c0182b..1d81191 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -680,8 +680,13 @@ void BScreen::propertyNotify(Atom atom) {
 }
 
 void BScreen::keyPressEvent(XKeyEvent &ke) {
-    Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
-                                          Keys::GLOBAL|Keys::ON_DESKTOP);
+    if (Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
+                Keys::GLOBAL|Keys::ON_DESKTOP)) {
+
+        // re-grab keyboard, so we don't pass KeyRelease to clients
+        // also for catching invalid keys in the middle of keychains
+        FbTk::EventManager::instance()->grabKeyboard(rootWindow().window());
+    }
 }
 
 void BScreen::keyReleaseEvent(XKeyEvent &ke) {