diff --git a/src/core/window.c b/src/core/window.c
index dbac50751..13d8e2a92 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1613,7 +1613,8 @@ meta_window_new (MetaDisplay       *display,
                                    META_WINDOW_CLIENT_TYPE_X11,
                                    NULL,
                                    xwindow,
-                                   TRUE,
+                                   /* XXX */
+                                   !meta_is_wayland_compositor (),
                                    existing_wm_state,
                                    effect,
                                    &attrs);
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 02c5b7bc3..c9be27205 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -48,6 +48,8 @@ xserver_set_window_id (struct wl_client *client,
     {
       surface->window = window;
       window->surface = surface;
+
+      meta_window_set_surface_mapped (window, TRUE);
     }
 }