--- a/client.c	Tue Sep 05 18:43:15 2006 +0200
+++ b/client.c	Tue Sep 05 19:26:34 2006 +0200
@@ -247,6 +247,8 @@
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
+	if(c->isfloat)
+		c->weight = ntags;
 
 	if(clients)
 		clients->prev = c;

--- a/tag.c	Tue Sep 05 18:43:15 2006 +0200
+++ b/tag.c	Tue Sep 05 19:26:34 2006 +0200
@@ -106,7 +106,8 @@
 	if(!matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = seltag[i];
-	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
+	if(!c->isfloat)
+		for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -120,7 +121,8 @@
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	sel->tags[arg->i] = True;
-	sel->weight = arg->i;
+	if(!sel->isfloat)
+		sel->weight = arg->i;
 	arrange(NULL);
 }
 
@@ -136,6 +138,7 @@
 	for(i = 0; i < ntags && !sel->tags[i]; i++);
 	if(i == ntags)
 		sel->tags[arg->i] = True;
-	sel->weight = (i == ntags) ? arg->i : i;
+	if(!sel->isfloat)
+		sel->weight = (i == ntags) ? arg->i : i;
 	arrange(NULL);
 }

--- a/view.c	Tue Sep 05 18:43:15 2006 +0200
+++ b/view.c	Tue Sep 05 19:26:34 2006 +0200
@@ -82,8 +82,8 @@
 	maximized = False;
 
 	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 
 	if(n > 1)
@@ -186,8 +186,8 @@
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
@@ -311,22 +311,15 @@
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
+	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+		if(isvisible(c))
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	/* this is somewhat tricky, it asserts to only zoom tiled clients */
-	for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
-	if(c) {
-		if(c == sel)
-			for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
-		else
-			c = sel;
-	}
-	if(!c)
-		return;
+	if((c = sel) == getnext(clients))
+		if(!(c = getnext(c->next)) || c->isfloat)
+			return;
 	detach(c);
 	c->next = clients;
 	clients->prev = c;