--- a/dwm.c	Wed Jul 01 19:15:20 2009 +0100
+++ b/dwm.c	Thu Jul 02 14:42:06 2009 +0100
@@ -1195,7 +1195,7 @@
 	for(m = mons; m; m = m->next)
 		if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
 			return m;
-	return mons;
+	return selmon;
 }
 
 void
@@ -1758,7 +1758,7 @@
 
 	/* select focused monitor */
 	cleanupmons();
-	mons = newmons;
+	selmon = mons = newmons;
 	selmon = wintomon(root);
 }
 
@@ -1891,7 +1891,7 @@
 			return m;
 	if((c = wintoclient(w)))
 		return c->mon;
-	return mons;
+	return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are