1 files changed, 6 insertions, 2 deletions
diff --git a/tag.c b/tag.c
index a718ebd2..4b6d513c 100644
--- a/tag.c
+++ b/tag.c
@@ -47,7 +47,9 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if((sel = getnext(clients))) {
+	if(!sel || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel) {
 		focus(sel);
 		restack();
 	}
@@ -111,7 +113,9 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if((sel = getnext(clients)))
+	if(!sel || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel)
 		focus(sel);
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);