diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 3208890..a450714 100755
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -693,10 +693,11 @@ for s = 1, screen.count() do screen[s]:connect_signal("arrange", function ()
 
         if #clients > 0 then -- Fine grained borders and floaters control
             for _, c in pairs(clients) do -- Floaters always have borders
-                if awful.client.floating.get(c) or layout == "floating" then
+                -- No borders with only one humanly visible client
+                if layout == "max" then
+                    c.border_width = 0
+                elseif awful.client.floating.get(c) or layout == "floating" then
                     c.border_width = beautiful.border_width
-
-                -- No borders with only one visible client
                 elseif #clients == 1 then 
                     clients[1].border_width = 0
                     if layout ~= "max" then