diff --git a/lib/awful/layout/init.lua b/lib/awful/layout/init.lua
index dd81cba0..3c7546e3 100644
--- a/lib/awful/layout/init.lua
+++ b/lib/awful/layout/init.lua
@@ -238,14 +238,8 @@ capi.tag.connect_signal("property::useless_gap", arrange_tag)
 capi.tag.connect_signal("property::master_fill_policy", arrange_tag)
 capi.tag.connect_signal("tagged", arrange_tag)
 
-for s = 1, capi.screen.count() do
-    capi.screen[s]:connect_signal("property::workarea", function(screen)
-        layout.arrange(screen)
-    end)
-    capi.screen[s]:connect_signal("padding", function (screen)
-        layout.arrange(screen)
-    end)
-end
+capi.screen.connect_signal("property::workarea", layout.arrange)
+capi.screen.connect_signal("padding", layout.arrange)
 
 capi.client.connect_signal("raised", function(c) layout.arrange(c.screen) end)
 capi.client.connect_signal("lowered", function(c) layout.arrange(c.screen) end)