--- a/client.c	Fri Aug 11 08:34:42 2006 +0200
+++ b/client.c	Fri Aug 11 08:47:55 2006 +0200
@@ -438,13 +438,8 @@
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
-	if(sel == c) {
-		sel = getnext(c->next);
-		if(!sel)
-			sel = getprev(c->prev);
-		if(!sel)
-			sel = clients;
-	}
+	if(sel == c)
+		sel = getnext(clients);
 	free(c->tags);
 	free(c);