diff --git a/src/layout.c b/src/layout.c
index eef73a9..842ae17 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -43,10 +43,13 @@ arrange(int screen, Bool update_layout)
           screen = screen_get_sel();
 
      for(c = clients; c; c = c->next)
-          if(!ishide(c, screen))
-               client_unhide(c);
-          else
-               client_hide(c);
+          if(c->screen == screen)
+          {
+               if(!ishide(c, screen))
+                    client_unhide(c);
+               else
+                    client_hide(c);
+          }
 
      if(tags[screen][seltag[screen]].layout.func)
      {