diff --git a/src/mango.c b/src/mango.c
index aff8b9a..9fc9e4c 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4568,8 +4568,10 @@ void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus) {
 		setfloating(c, c->isfloating);
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 	}
-	if (m && focus)
-		focusclient(focustop(m), 1);
+
+	if (focus) {
+		focusclient(focustop(selmon), 1);
+	}
 
 	if (m) {