M src/fluxbox.cc → src/fluxbox.cc

@@ -679,13 +679,12 @@ FbTk::Menu::focused() != 0 &&
         FbTk::Menu::focused()->window() == e->xfocus.window) {
 
         // find screen num
-        BScreen *screen = 0;
         ScreenList::iterator it = m_screen_list.begin();
         ScreenList::iterator it_end = m_screen_list.end();
         for (; it != it_end; ++it) {
             if ( (*it)->screenNumber() ==
                  FbTk::Menu::focused()->fbwindow().screenNumber()) {
-                screen = (*it);
+                FocusControl::revertFocus(**it);
                 break; // found the screen, no more search
             }
         }
@@ -1786,7 +1785,8 @@ m_reconfigure_wait = m_reread_menu_wait = false;
 }
 
 void Fluxbox::revert_focus() {
-    if (m_revert_screen && !FocusControl::focusedWindow())
+    if (m_revert_screen && !FocusControl::focusedWindow() &&
+        !FbTk::Menu::focused())
         FocusControl::revertFocus(*m_revert_screen);
 }