diff --git a/client.c b/client.c
index 8d5ea30..6a231b9 100644
--- a/client.c
+++ b/client.c
@@ -262,11 +262,13 @@ manage(Window w, XWindowAttributes *wa)
 				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
 
+	if(isvisible(c))
+		sel = c;
+	arrange(NULL);
 	XMapWindow(dpy, c->win);
 	XMapWindow(dpy, c->title);
 	if(isvisible(c))
 		focus(c);
-	arrange(NULL);
 }
 
 void