diff --git a/dwm.c b/dwm.c
index 349744f..61a75b2 100644
--- a/dwm.c
+++ b/dwm.c
@@ -939,7 +939,7 @@ void
 focus(Client *c)
 {
 	if (!c || !ISVISIBLE(c))
-		for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+		for (c = selmon->stack; c && (!ISVISIBLE(c) || c->isfloating); c = c->snext);
 	if (selmon->sel && selmon->sel != c)
 		unfocus(selmon->sel, 0);
 	if (c) {