diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
index 1140587ed..2fa1a0e1c 100644
--- a/src/wayland/meta-wayland-xdg-shell.c
+++ b/src/wayland/meta-wayland-xdg-shell.c
@@ -642,6 +642,9 @@ xdg_popup_reposition (struct wl_client   *client,
   MetaWaylandXdgPositioner *xdg_positioner;
   MetaWaylandTransaction *transaction;
 
+  if (!meta_wayland_surface_get_window (surface))
+    return;
+
   xdg_positioner = g_memdup2 (wl_resource_get_user_data (positioner_resource),
                               sizeof (MetaWaylandXdgPositioner));