--- client.c	2006-08-03 18:16:26.000000000 +0200
+++ client.c.orig	2006-08-03 18:16:26.000000000 +0200
@@ -65,11 +65,12 @@
 focusnext(Arg *arg)
 {
 	Client *c;
+	Bool wasmax;
    
 	if(!sel)
 		return;
 
-	if(sel->ismax)
+	if((wasmax = sel->ismax))
 		togglemax(NULL);
 
 	if(!(c = getnext(sel->next)))
@@ -78,17 +79,20 @@
 		higher(c);
 		focus(c);
 	}
+	if (wasmax)
+		togglemax(NULL);
 }
 
 void
 focusprev(Arg *arg)
 {
 	Client *c;
+	Bool wasmax;
 
 	if(!sel)
 		return;
 
-	if(sel->ismax)
+	if((wasmax = sel->ismax))
 		togglemax(NULL);
 
 	if(!(c = getprev(sel->prev))) {
@@ -99,6 +103,8 @@
 		higher(c);
 		focus(c);
 	}
+	if (wasmax)
+		togglemax(NULL);
 }
 
 Client *