diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index e06f39654d..51a7b02dc1 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1706,7 +1706,10 @@ gdk_wayland_window_map (GdkWindow *window)
                                             &window->x, &window->y, NULL);
         }
       else
-        transient_for = get_popup_parent (impl->transient_for);
+        {
+          transient_for = gdk_window_get_effective_toplevel (impl->transient_for);
+          transient_for = get_popup_parent (transient_for);
+        }
 
       if (!transient_for)
         {