diff --git a/openbox/event.c b/openbox/event.c
index 31759113..c8b7e6dc 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -573,7 +573,8 @@ static void event_process(const XEvent *ec, gpointer data)
 
         if (client && !nomove) {
             frame_adjust_focus(client->frame, FALSE);
-            focus_set_client(NULL);
+            if (client == focus_client)
+                focus_set_client(NULL);
             /* focus_set_client has already been called for sure */
             client_calc_layer(client);
         }