diff --git a/src/wayland/meta-wayland-wl-shell.c b/src/wayland/meta-wayland-wl-shell.c
index 7a3490913..efd3f9778 100644
--- a/src/wayland/meta-wayland-wl-shell.c
+++ b/src/wayland/meta-wayland-wl-shell.c
@@ -532,6 +532,13 @@ static void
 wl_shell_surface_role_managed (MetaWaylandSurfaceRoleShellSurface *shell_surface_role,
                                MetaWindow                         *window)
 {
+  MetaWaylandSurfaceRole *surface_role =
+    META_WAYLAND_SURFACE_ROLE (shell_surface_role);
+  MetaWaylandSurface *surface =
+    meta_wayland_surface_role_get_surface (surface_role);
+
+  if (surface->wl_shell.state == META_WL_SHELL_SURFACE_STATE_POPUP)
+    meta_window_set_type (window, META_WINDOW_DROPDOWN_MENU);
 }
 
 static void