diff -r 5d7e363f889d client.c
--- a/client.c	Mon Jan 15 12:07:18 2007 +0100
+++ b/client.c	Mon Jan 15 17:15:35 2007 -0500
@@ -90,7 +90,7 @@ focus(Client *c) {
 		sel = c;
 		if(old) {
 			grabbuttons(old, False);
-			XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
+			XSetWindowBorder(dpy, old->win, dc.norm[old->isfloat ? ColFG : ColBorder]);
 		}
 	}
 	if(c) {
@@ -98,7 +98,7 @@ focus(Client *c) {
 		c->snext = stack;
 		stack = c;
 		grabbuttons(c, True);
-		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+		XSetWindowBorder(dpy, c->win, dc.sel[c->isfloat ? ColFG : ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
diff -r 5d7e363f889d view.c
--- a/view.c	Mon Jan 15 12:07:18 2007 +0100
+++ b/view.c	Mon Jan 15 17:16:17 2007 -0500
@@ -208,6 +208,7 @@ togglefloat(Arg *arg) {
 	if (!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
+	XSetWindowBorder(dpy, sel->win, dc.sel[sel->isfloat ? ColFG : ColBorder]);
 	arrange();
 }