diff --git a/lib/awful/ewmh.lua b/lib/awful/ewmh.lua
index 9a3ea246..2b7861d9 100644
--- a/lib/awful/ewmh.lua
+++ b/lib/awful/ewmh.lua
@@ -292,17 +292,13 @@ function ewmh.geometry(c, context, hints)
 
         if original_context == "fullscreen" and beautiful.fullscreen_hide_border ~= false then
             props.ignore_border_width = true
+            props.zap_border_width = true
         end
 
+        local original = repair_geometry_lock
+        repair_geometry_lock = true
         aplace[context](c, props)
-
-        -- Remove the border to get a "real" fullscreen.
-        if original_context == "fullscreen" and beautiful.fullscreen_hide_border ~= false then
-            local original = repair_geometry_lock
-            repair_geometry_lock = true
-            c.border_width = 0
-            repair_geometry_lock = original
-        end
+        repair_geometry_lock = original
     end
 end
 
diff --git a/lib/awful/placement.lua b/lib/awful/placement.lua
index aa0ad3e2..1de4c8bb 100644
--- a/lib/awful/placement.lua
+++ b/lib/awful/placement.lua
@@ -352,6 +352,9 @@ end
 -- @treturn The drawin's area.
 area_common = function(d, new_geo, ignore_border_width, args)
     -- The C side expect no arguments, nil isn't valid
+    if new_geo and args.zap_border_width then
+        d.border_width = 0
+    end
     local geometry = new_geo and d:geometry(new_geo) or d:geometry()
     local border = ignore_border_width and 0 or d.border_width or 0