diff --git a/rc.lua b/rc.lua
index 4848fca..e748394 100644
--- a/rc.lua
+++ b/rc.lua
@@ -433,6 +433,11 @@ clientkeys = awful.util.table.join(
 		function (c)
 			c.maximized_horizontal = not c.maximized_horizontal
 			c.maximized_vertical   = not c.maximized_vertical
+			if c.maximized_horizontal == true and c.maximized_vertical == true then
+				c.border_width = 0
+			else
+				c.border_width = beautiful.border_width
+			end
 		end)
 )