diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 2560ae6c6..a41c9ac36 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1972,10 +1972,8 @@ shell_configure_fullscreen(struct shell_surface *shsurf)
 	struct weston_surface *surface =
 		weston_desktop_surface_get_surface(shsurf->desktop_surface);
 
-	/* Reverse the effect of lower_fullscreen_layer() */
-	weston_layer_entry_remove(&shsurf->view->layer_link);
-	weston_layer_entry_insert(&shsurf->shell->fullscreen_layer.view_list,
-				  &shsurf->view->layer_link);
+	weston_view_move_to_layer(shsurf->view,
+				  &shsurf->shell->fullscreen_layer.view_list);
 
 	shell_ensure_fullscreen_black_view(shsurf);