2 files changed, 14 insertions, 6 deletions

diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 2ced53f..204d1b9 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -54,8 +54,7 @@ void NextWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (screen != fb->watchingScreen())
-                    Fluxbox::instance()->watchKeyRelease(*screen, mods);
+                Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().nextFocus(m_option);
             }
         } else
@@ -76,8 +75,7 @@ void PrevWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (screen != fb->watchingScreen())
-                    Fluxbox::instance()->watchKeyRelease(*screen, mods);
+                Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().prevFocus(m_option);
             }
         } else
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index fdc5d37..8a810a4 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1113,12 +1113,22 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
     if (keyScreen() == 0 || mouseScreen() == 0)
         return;
 
+    BScreen *old_watching_screen = m_watching_screen;
+
     switch (ke.type) {
     case KeyPress:
-        if (m_key->doAction(ke))
+        // see if we need to keep watching for key releases
+        m_watching_screen = 0;
+        if (m_key->doAction(ke)) {
             XAllowEvents(FbTk::App::instance()->display(), AsyncKeyboard, CurrentTime);
-        else
+            // if we've done some action other than cycling focus
+            if (old_watching_screen && m_watching_screen != old_watching_screen)
+                old_watching_screen->notifyReleasedKeys(ke);
+        } else {
             XAllowEvents(FbTk::App::instance()->display(), ReplayKeyboard, CurrentTime);
+            // could still be cycling
+            m_watching_screen = old_watching_screen;
+        }
         break;
     case KeyRelease: {
         // we ignore most key releases unless we need to use