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

--- a/view.c	Tue Sep 05 19:26:34 2006 +0200
+++ b/view.c	Wed Sep 06 09:13:31 2006 +0200
@@ -38,6 +38,13 @@
 	clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c)
+{
+	for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
@@ -82,8 +89,8 @@
 	maximized = False;
 
 	w = sw - mw;
-	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-		if(isvisible(c))
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
 			n++;
 
 	if(n > 1)
@@ -186,8 +193,8 @@
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-		if(isvisible(c))
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
@@ -311,14 +318,14 @@
 	unsigned int n;
 	Client *c;
 
-	for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-		if(isvisible(c))
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if((c = sel) == getnext(clients))
-		if(!(c = getnext(c->next)) || c->isfloat)
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c)))
 			return;
 	detach(c);
 	c->next = clients;