diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 71c63caf..aa3edab3 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -3048,7 +3048,9 @@ xserver_map_shell_surface(struct weston_wm_window *window,
 	} else if (window->override_redirect) {
 		xwayland_interface->set_xwayland(window->shsurf,
 						 window->x, window->y);
-	} else if (window->transient_for && window->transient_for->surface) {
+	} else if (window->transient_for &&
+		   !window->transient_for->override_redirect &&
+		   window->transient_for->surface) {
 		parent = window->transient_for;
 		if (weston_wm_window_type_inactive(window)) {
 			xwayland_interface->set_transient(window->shsurf,