--- a/client.c	Wed Sep 06 13:56:46 2006 +0200
+++ b/client.c	Wed Sep 06 15:30:28 2006 +0200
@@ -99,6 +99,13 @@
 		}
 	}
 	if(c) {
+		if(c->isfloat || arrange == dofloat) {
+			detach(c);
+			if(clients)
+				clients->prev = c;
+			c->next = clients;
+			clients = c;
+		}
 		grabbuttons(c, True);
 		drawtitle(c);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -243,8 +250,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	Wed Sep 06 13:56:46 2006 +0200
+++ b/tag.c	Wed Sep 06 15:30:28 2006 +0200
@@ -110,8 +110,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
@@ -125,8 +124,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);
 }
 
@@ -142,7 +140,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);
 }