diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index af12fa8290..d8d2a02d0b 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -1569,6 +1569,8 @@ gdk_wayland_surface_handle_configure_popup (GdkSurface *surface,
                                   &flipped_x,
                                   &flipped_y);
 
+  impl->position_method = POSITION_METHOD_MOVE_TO_RECT;
+
   g_signal_emit_by_name (surface,
                          "moved-to-rect",
                          &flipped_rect,
@@ -2467,6 +2469,9 @@ should_map_as_popup (GdkSurface *surface)
       break;
     }
 
+  if (impl->position_method == POSITION_METHOD_MOVE_TO_RECT)
+    return TRUE;
+
   return FALSE;
 }