diff --git a/clients/window.c b/clients/window.c
index 9a75a462..aba12540 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3772,6 +3772,9 @@ display_create(int argc, char *argv[])
 		return NULL;
 	}
 
+	d->workspace = 0;
+	d->workspace_count = 1;
+
 	/* Set up listener so we'll catch all events. */
 	wl_display_add_global_listener(d->display,
 				       display_handle_global, d);
@@ -3794,9 +3797,6 @@ display_create(int argc, char *argv[])
 
 	wl_list_init(&d->window_list);
 
-	d->workspace = 0;
-	d->workspace_count = 1;
-
 	return d;
 }