diff --git a/src/client.c b/src/client.c
index df0d6ac..16fe92d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -136,6 +136,7 @@ client_focus(Client *c)
                XSetWindowBorder(dpy, sel->tbar->win, conf.colors.bordernormal);
 
      }
+
      if(c)
           grabbuttons(c, True);
 
diff --git a/src/layout.c b/src/layout.c
index 6ab12ce..ac40fc9 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -45,7 +45,7 @@ arrange(void)
 
      tags[seltag].layout.func();
 
-     if(selbytag[seltag])
+     if(selbytag[seltag] && selbytag[seltag]->win)
           client_focus(selbytag[seltag]);
      else
           client_focus(NULL);