diff --git a/libqtile/group.py b/libqtile/group.py
index 22b2b88431..fbfff4518f 100644
--- a/libqtile/group.py
+++ b/libqtile/group.py
@@ -265,8 +265,10 @@ def add(self, win, focus=True, force=False):
             self.tiled_windows.add(win)
             for i in self.layouts:
                 i.add_client(win)
-        if focus:
+        if focus or not self.current_window:
             self.focus(win, warp=True, force=force)
+        elif self.current_window:
+            self.focus(self.current_window, warp=False)
 
     def remove(self, win, force=False):
         self.windows.remove(win)