diff --git a/lib/awful/ewmh.lua b/lib/awful/ewmh.lua
index cd04c9ea3..e2b5ed8ee 100644
--- a/lib/awful/ewmh.lua
+++ b/lib/awful/ewmh.lua
@@ -70,11 +70,11 @@ local function fullscreen(window, set)
     if set then
         store_geometry(window, "fullscreen")
         data[window].fullscreen.border_width = window.border_width
-        window:geometry(screen[window.screen].geometry)
         window.border_width = 0
+        window:geometry(screen[window.screen].geometry)
     elseif data[window] and data[window].fullscreen then
-        window:geometry(data[window].fullscreen)
         window.border_width = data[window].fullscreen.border_width
+        window:geometry(data[window].fullscreen)
     end
 end