diff --git a/.gitignore b/.gitignore
index 3dddcb1..dae2d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 rc.lua
+rc.lua.save
 theme-personal.lua
 .luacheckrc
diff --git a/rc.lua.template b/rc.lua.template
index 9b412df..db10f14 100644
--- a/rc.lua.template
+++ b/rc.lua.template
@@ -754,18 +754,7 @@ client.connect_signal("mouse::enter", function(c)
     c:emit_signal("request::activate", "mouse_enter", {raise = true})
 end)
 
--- No borders if only 1 non floating or maximised client visible
-function border_adjust(c)
-    if c.maximized or c.floating and #c.screen.clients == 1 then
-        c.border_width = 0
-    elseif #c.screen.clients > 1 then
-        c.border_width = beautiful.border_width
-        c.border_color = beautiful.border_focus
-    end
-end
-
-client.connect_signal("property::maximized", border_adjust)
-client.connect_signal("focus", border_adjust)
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 -- possible workaround for tag preservation when switching back to default screen: