--- a/dwm.c	Wed Jun 24 19:45:47 2009 +0100
+++ b/dwm.c	Wed Jun 24 19:51:41 2009 +0100
@@ -400,12 +400,9 @@
 	for(m = mons; m; m = m->next)
 		if(ev->window == m->barwin) {
 			if(m != selmon) {
-				if(selmon->stack)
-					focus(selmon->stack);
-				else {
-					selmon = m;
-					focus(NULL);
-				}
+				unfocus(selmon->stack);
+				selmon = m;
+				focus(NULL);
 			}
 			break;
 		}
@@ -1608,6 +1605,7 @@
 		return;
 	grabbuttons(c, False);
 	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+	XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
 void