--- a/dwm.c	Wed Jun 24 13:51:45 2009 +0100
+++ b/dwm.c	Wed Jun 24 15:37:32 2009 +0100
@@ -762,6 +762,8 @@
 		XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
+		if(c->mon != selmon)
+			selmon = c->mon;
 		if(c->isurgent)
 			clearurgent(c);
 		detachstack(c);
@@ -792,8 +794,12 @@
 
 	for(i = 0, m = mons; m; m = m->next, i++)
 		if(i == arg->ui) {
-			selmon = m;
-			focus(NULL);
+			if(m->stack)
+				focus(m->stack);
+			else {
+				selmon = m;
+				focus(NULL);
+			}
 			drawbars();
 			break;
 		}