M src/Window.cc → src/Window.cc

@@ -996,6 +996,7 @@ // in case the window is being destroyed, but this should never happen
     if (!button)
         return false;
 
+    WinClient *old = m_client;
     m_client = &client;
     m_client->raise();
     m_client->focusSig().notify();
@@ -1009,7 +1010,11 @@ // frame focused doesn't necessarily mean input focused
     frame().setLabelButtonFocus(*button);
     frame().setShapingClient(&client, false);
 
-    return setinput && focus();
+    bool ret = setinput && focus();
+    if (setinput)
+        // restore old client until focus event comes
+        m_client = old;
+    return ret;
 }
 
 bool FluxboxWindow::isGroupable() const {