diff --git a/client.c b/client.c
index 4895817..0b9f121 100644
--- a/client.c
+++ b/client.c
@@ -121,9 +121,6 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	(state == IconicState) ? client_hide(cc) : client_unhide(cc);
 	xu_setstate(cc, cc->state);
 
-	XSync(X_Dpy, False);
-	XUngrabServer(X_Dpy);
-
 	TAILQ_INSERT_TAIL(&sc->mruq, cc, mru_entry);
 	TAILQ_INSERT_TAIL(&Clientq, cc, entry);
 
@@ -135,6 +132,9 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	if (mapped)
 		group_autogroup(cc);
 
+	XSync(X_Dpy, False);
+	XUngrabServer(X_Dpy);
+
 	return (cc);
 }