diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 712d7d07..87bc74bb 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -566,7 +566,6 @@ function floating.set(c, s)
             c:geometry(property.get(c, "floating_geometry"))
         end
         c.screen = screen
-        capi.hooks.arrange()(c.screen)
     end
 end
 
@@ -772,7 +771,6 @@ function incwfact(add, c)
 
     -- keep our ratios normalized
     normalize(colfact, w.num)
-    capi.hooks.arrange()(t.screen)
 end
 
 --- Get a client dockable state.
diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in
index 540403ff..72f53ec9 100644
--- a/lib/awful/layout/init.lua.in
+++ b/lib/awful/layout/init.lua.in
@@ -109,7 +109,8 @@ hooks.property.register(function (obj, prop)
             or prop == "maximized_vertical"
             or prop == "border_width"
             or prop == "hide"
-            or prop == "titlebar" then
+            or prop == "titlebar"
+            or prop == "floating" then
             on_arrange(obj.screen)
         elseif prop == "screen" then
             -- If prop is screen, we do not know what was the previous screen, so