diff --git a/layout.c b/layout.c
index d899c7dd..e1d18a23 100644
--- a/layout.c
+++ b/layout.c
@@ -71,7 +71,7 @@ arrange(int screen)
 
     /* if we have a valid client that could be focused but currently no window
      * are focused, then set the focus on this window */
-    if((c = focus_get_current_client(screen)) && !globalconf.focus->client)
+    if((c = focus_get_current_client(screen)) && globalconf.focus->client != c)
         client_focus(c, screen, True);
 
     /* check that the mouse is on a window or not */