diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 2447c5d4b4..8d311371f1 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1221,9 +1221,14 @@ should_be_mapped (GdkWindow *window)
 static gboolean
 should_map_as_subsurface (GdkWindow *window)
 {
+  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+
   if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_SUBSURFACE)
     return TRUE;
 
+  if (impl->hint == GDK_WINDOW_TYPE_HINT_TOOLTIP)
+    return TRUE;
+
   return FALSE;
 }