diff --git a/openbox/client.c b/openbox/client.c
index 22db6738..7fca4796 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -312,7 +312,8 @@ void client_unmanage(Client *self)
         }
     }
 
-    client_unfocus(self);
+    if (focus_client == self)
+        client_unfocus(self);
 
     /* remove from its group */
     if (self->group) {