diff --git a/libweston/desktop/xwayland.c b/libweston/desktop/xwayland.c
index 9effecad..058a081a 100644
--- a/libweston/desktop/xwayland.c
+++ b/libweston/desktop/xwayland.c
@@ -129,10 +129,9 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
 
 			surface->view =
 				weston_desktop_surface_create_view(surface->surface);
-			weston_layer_entry_insert(&surface->xwayland->layer.view_list,
-						  &surface->view->layer_link);
-			surface->view->is_mapped = true;
 			weston_surface_map(wsurface);
+			weston_view_move_to_layer(surface->view,
+						  &surface->xwayland->layer.view_list);
 		}
 
 		/* If the surface state was updated by the shell during this