diff --git a/client.c b/client.c
index 7a073c8..8556395 100644
--- a/client.c
+++ b/client.c
@@ -67,12 +67,18 @@ client_init(Window win, struct screen_ctx *sc)
 		mapped = wattr.map_state != IsUnmapped;
 	}
 
-	cc = xcalloc(1, sizeof(*cc));
+	cc = xmalloc(sizeof(*cc));
 
 	XGrabServer(X_Dpy);
 
 	cc->sc = sc;
 	cc->win = win;
+	cc->gc = NULL;
+	cc->flags = 0;
+	cc->stackingorder = 0;
+	memset(&cc->hint, 0, sizeof(cc->hint));
+	cc->ptr.x = -1;
+	cc->ptr.y = -1;
 
 	TAILQ_INIT(&cc->nameq);
 	client_setname(cc);
@@ -85,10 +91,6 @@ client_init(Window win, struct screen_ctx *sc)
 	client_getsizehints(cc);
 	client_mwm_hints(cc);
 
-	/* Saved pointer position */
-	cc->ptr.x = -1;
-	cc->ptr.y = -1;
-
 	cc->geom.x = wattr.x;
 	cc->geom.y = wattr.y;
 	cc->geom.w = wattr.width;