diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in
index b88184936..973926cbd 100644
--- a/lib/awful/layout/init.lua.in
+++ b/lib/awful/layout/init.lua.in
@@ -116,6 +116,9 @@ local function arrange_on_tagged(c, tag)
 end
 
 for s = 1, capi.screen.count() do
+    capi.screen[s]:add_signal("property::workarea", function(screen)
+        arrange(screen.index)
+    end)
     capi.screen[s]:add_signal("tag::attach", function (screen, tag)
         arrange(screen.index)
         tag:add_signal("property::mwfact", arrange_prop)
@@ -139,10 +142,6 @@ for s = 1, capi.screen.count() do
     capi.screen[s]:add_signal("padding", arrange)
 end
 
-capi.awesome.add_signal("arrange", function(screen)
-    arrange(screen)
-end)
-
 capi.client.add_signal("focus", function(c) arrange(c.screen) end)
 capi.client.add_signal("list", function()
                                    for screen = 1, capi.screen.count() do