diff --git a/client.c b/client.c
index 4de7708f..96893d4a 100644
--- a/client.c
+++ b/client.c
@@ -819,7 +819,6 @@ client_setfullscreen(client_t *c, bool s)
             client_setborder(c, c->border_fs);
         }
         client_resize(c, geometry, false);
-        client_need_arrange(c);
         client_stack();
         ewmh_client_update_hints(c);
         hook_property(client, c, "fullscreen");
diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in
index 61765da5..f564f42d 100644
--- a/lib/awful/layout/init.lua.in
+++ b/lib/awful/layout/init.lua.in
@@ -98,7 +98,8 @@ hooks.property.register(function (c, prop)
         and (prop == "size_hints_honor"
              or prop == "struts"
              or prop == "minimized"
-             or prop == "sticky") then
+             or prop == "sticky"
+             or prop == "fullscreen") then
         on_arrange(c.screen)
     end
 end)