--- a/client.c	Mon Aug 21 09:03:14 2006 +0200
+++ b/client.c	Mon Aug 21 17:41:09 2006 +0200
@@ -73,12 +73,14 @@
 {
 	Client *old = sel;
 
-	if (!issel)
+	if(!issel)
 		return;
-	if(sel && sel->ismax && sel != c)
-		togglemax(NULL);
-	sel = c;
-	if(old && old != c) {
+	if(!sel)
+		sel = c;
+	else if(sel != c) {
+		if(sel->ismax)
+			togglemax(NULL);
+		sel = c;
 		grabbutton(old, AnyButton, 0);
 		drawtitle(old);
 	}