diff --git a/awesome/rc.lua b/awesome/rc.lua
index 13d1a5f..12d241f 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -175,11 +175,12 @@ client.connect_signal("unmanage", function(unmanaged)
 end)
 
 client.connect_signal("focus", function(c)
-  c.border_color = beautiful.border_focus
+    if #c.screen.clients > 1 then
+          c.border_color = beautiful.border_focus
+    end
+    move_mouse_onto_focused_client()
 end)
 
 client.connect_signal("unfocus", function(c)
   c.border_color = beautiful.border_normal
 end)
-
-client.connect_signal("focus", move_mouse_onto_focused_client)