diff --git a/clutter/wayland/clutter-stage-wayland.c b/clutter/wayland/clutter-stage-wayland.c
index 17843f124..a0edfdccf 100644
--- a/clutter/wayland/clutter-stage-wayland.c
+++ b/clutter/wayland/clutter-stage-wayland.c
@@ -93,6 +93,9 @@ clutter_stage_wayland_realize (ClutterStageWindow *stage_window)
                                  &shell_surface_listener,
                                  stage_wayland);
 
+  stage_wayland->wayland_surface = wl_surface;
+  stage_wayland->wayland_shell_surface = wl_shell_surface;
+
   return TRUE;
 }
 
diff --git a/clutter/wayland/clutter-stage-wayland.h b/clutter/wayland/clutter-stage-wayland.h
index 58bb431f7..0394307f1 100644
--- a/clutter/wayland/clutter-stage-wayland.h
+++ b/clutter/wayland/clutter-stage-wayland.h
@@ -49,6 +49,9 @@ typedef struct _ClutterStageWaylandClass    ClutterStageWaylandClass;
 struct _ClutterStageWayland
 {
   ClutterStageCogl parent_instance;
+
+  struct wl_surface *wayland_surface;
+  struct wl_shell_surface *wayland_shell_surface;
 };
 
 struct _ClutterStageWaylandClass