1 files changed, 8 insertions, 2 deletions
diff --git a/dwm.c b/dwm.c
index 8862f59..e288ab6 100644
--- a/dwm.c
+++ b/dwm.c
@@ -762,6 +762,8 @@ focus(Client *c) {
 		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 @@ focusmon(const Arg *arg) {
 
 	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;
 		}