1 files changed, 3 insertions, 3 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 9775b9d..a1896e9 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -811,13 +811,13 @@ void Fluxbox::handleEvent(XEvent * const e) {
         if (FbTk::Menu::focused() &&
             FbTk::Menu::focused()->window() == e->xfocus.window) {
             m_keyscreen = findScreen(FbTk::Menu::focused()->screenNumber());
+            FocusControl::setFocusedWindow(0);
             break;
         }
 
         WinClient *winclient = searchWindow(e->xfocus.window);
-        if (!winclient)
-            break;
-        m_keyscreen = &winclient->screen();
+        if (winclient)
+            m_keyscreen = &winclient->screen();
         FocusControl::setFocusedWindow(winclient);
 
     } break;