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

@@ -1016,10 +1016,16 @@ // frame focused doesn't necessarily mean input focused
     frame().setLabelButtonFocus(*button);
     frame().setShapingClient(&client, false);
 
+    setinput = setinput || m_focused && !screen().focusControl().isCycling();
     bool ret = setinput && focus();
-    if (setinput)
+    if (setinput) {
         // restore old client until focus event comes
         m_client = old;
+        if (!ret && old) {
+            old->raise();
+            titleSig().notify();
+        }
+    }
     return ret;
 }