diff --git a/src/layout.c b/src/layout.c
index d883295..045e299 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -51,7 +51,6 @@ arrange(void)
           }
 
      tags[selscreen][seltag[selscreen]].layout.func();
-     client_focus(NULL);
      infobar_draw(selscreen);
 
      return;
diff --git a/src/tag.c b/src/tag.c
index 45b6d6e..a05bcb1 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -73,6 +73,7 @@ uicb_tag(uicb_t cmd)
      }
 
      arrange();
+     client_focus(NULL);
 
      return;
 }