diff --git a/src/client.c b/src/client.c
index 07a6572..0b895bc 100644
--- a/src/client.c
+++ b/src/client.c
@@ -41,7 +41,6 @@ client_pertag(int tag)
      for(c = clients; c; c = c->next)
           if(c->tag == tag)
                ++i;
-     efree(c);
 
      return i;
 }
@@ -152,8 +151,6 @@ client_focus(Client *c)
           if(!ishide(cc))
                titlebar_update(cc);
 
-     efree(cc);
-
      return;
 }
 
diff --git a/src/layout.c b/src/layout.c
index 6e50d7f..516d500 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -280,7 +280,8 @@ uicb_tile_switch(uicb_t cmd)
           return;
      if((c = sel) == nexttiled(clients))
           if(!(c = nexttiled(c->next)))
-               return;     client_detach(c);
+               return;
+     client_detach(c);
      client_attach(c);
      client_focus(c);
      arrange();