diff --git a/lib/awful/layout/init.lua b/lib/awful/layout/init.lua
index 7ef4d5f5e..26d8855eb 100644
--- a/lib/awful/layout/init.lua
+++ b/lib/awful/layout/init.lua
@@ -232,10 +232,11 @@ function layout.arrange(screen)
                 c:geometry(g)
             end
         end)
+        screen:emit_signal("arrange")
+
+        -- Release locks after signal to avoid deadly lock.
         arrange_lock = false
         delayed_arrange[screen] = nil
-
-        screen:emit_signal("arrange")
     end)
 end