--- a/client.c	Mon Aug 07 07:36:36 2006 +0200
+++ b/client.c	Mon Aug 07 08:05:04 2006 +0200
@@ -469,9 +469,11 @@
 	if(!sel || (arrange != dotile) || sel->isfloat)
 		return;
 
-	if(sel == getnext(clients) && sel->next)  {
+	if(sel == getnext(clients))  {
 		if((c = getnext(sel->next)))
 			sel = c;
+		else
+			return;
 	}
 
 	/* pop */