1 files changed, 5 insertions, 0 deletions

diff --git a/src/Keys.cc b/src/Keys.cc
index 34d5cc0..6a4406a 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -390,6 +390,11 @@ bool Keys::doAction(int type, unsigned int mods, unsigned int key,
     // grab "None Escape" to exit keychain in the middle
     unsigned int esc = FbTk::KeyUtil::getKey("Escape");
 
+    // if focus changes, windows will get NotifyWhileGrabbed,
+    // which they tend to ignore
+    if (temp_key && type == KeyPress)
+        XUngrabKeyboard(Fluxbox::instance()->display(), CurrentTime);
+
     if (temp_key && !temp_key->keylist.empty()) { // emacs-style
         if (!saved_keymode)
             saved_keymode = m_keylist;