diff --git a/client.c b/client.c
index 7a89aacc2..4de7708f6 100644
--- a/client.c
+++ b/client.c
@@ -257,10 +257,6 @@ client_focus_update(client_t *c)
     globalconf.screen_focus->prev_client_focus = c;
     globalconf.screen_focus->client_focus = c;
 
-    /* Some layouts use focused client differently, so call them back.
-     * And anyway, we have maybe unhidden */
-    client_need_arrange(c);
-
     /* according to EWMH, we have to remove the urgent state from a client */
     client_seturgent(c, false);
 
diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in
index 95bce77c1..eccd98a44 100644
--- a/lib/awful/layout/init.lua.in
+++ b/lib/awful/layout/init.lua.in
@@ -105,5 +105,6 @@ hooks.wibox_position.register(function(wibox)
 end)
 
 hooks.padding.register(function(screen) on_arrange(screen) end)
+hooks.focus.register(function(c) on_arrange(c.screen) end)
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80