diff --git a/dwl.c b/dwl.c
index 9fcd507..b70a217 100644
--- a/dwl.c
+++ b/dwl.c
@@ -714,12 +714,12 @@ closemon(Monitor *m)
 	Monitor *newmon;
 	Client *c;
 
+	focusclient(selclient(), focustop(dirtomon(-1)), 1);
 	wl_list_for_each(newmon, &mons, link) {
 		wl_list_for_each(c, &clients, link) {
-			if (c->isfloating && c->geom.x > m->m.width) {
+			if (c->isfloating && c->geom.x > m->m.width)
 				resize(c, c->geom.x - m->w.width, c->geom.y,
-						c->geom.width, c->geom.height, 0);
-			}
+					c->geom.width, c->geom.height, 0);
 			if (c->mon == m)
 				setmon(c, newmon, c->tags);
 		}