diff --git a/rc.lua.template b/rc.lua.template
index 4416ef1..5bfdfd0 100644
--- a/rc.lua.template
+++ b/rc.lua.template
@@ -224,7 +224,7 @@ end)
 screen.connect_signal("arrange", function (s)
     local only_one = #s.tiled_clients == 1
     for _, c in pairs(s.clients) do
-        if only_one and not c.floating or c.maximized then
+        if only_one and not c.floating or c.maximized or c.fullscreen then
             c.border_width = 0
         else
             c.border_width = beautiful.border_width