diff --git a/src/xwayland.c b/src/xwayland.c
index 345eb2df..d7e5ae6f 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -336,6 +336,8 @@ xwayland_surface_new(struct wl_listener *listener, void *data)
 	view->xwayland_surface = xsurface;
 	wl_list_init(&view->ssd.parts);
 
+	xsurface->data = view;
+
 	view->map.notify = handle_map;
 	wl_signal_add(&xsurface->events.map, &view->map);
 	view->unmap.notify = handle_unmap;