diff --git a/client.c b/client.c
index 8fc6685b1..5a8c871f5 100644
--- a/client.c
+++ b/client.c
@@ -183,7 +183,7 @@ void
 client_focus(Client *c, int screen, Bool raise)
 {
     /* if c is NULL or invisible, take next client in the focus history */
-    if(!c || (c && (!client_isvisible(c, screen) || c->skip)))
+    if(!c || (c && (!client_isvisible(c, screen))))
     {
         c = focus_get_current_client(screen);
         /* if c is still NULL take next client in the stack */
diff --git a/layout.c b/layout.c
index 18519a324..f5967613e 100644
--- a/layout.c
+++ b/layout.c
@@ -65,7 +65,7 @@ arrange(int screen)
         {
             c->newcomer = False;
             client_unban(c);
-            if(globalconf.screens[screen].new_get_focus)
+            if(globalconf.screens[screen].new_get_focus && !c->skip)
                 client_focus(c, screen, True);
         }