diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 2680af64..a8b527a7 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -377,11 +377,13 @@ static void handle_map(struct wl_listener *listener, void *data) {
 
 	view_map(view, view->wlr_xdg_surface->surface);
 
-	struct sway_server_decoration *deco =
-		decoration_from_surface(xdg_surface->surface);
-	bool csd = !deco || deco->wlr_server_decoration->mode ==
-		WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-	view_update_csd_from_client(view, csd);
+	if (!view->xdg_decoration) {
+		struct sway_server_decoration *deco =
+			decoration_from_surface(xdg_surface->surface);
+		bool csd = !deco || deco->wlr_server_decoration->mode ==
+			WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
+		view_update_csd_from_client(view, csd);
+	}
 
 	if (xdg_surface->toplevel->client_pending.fullscreen) {
 		container_set_fullscreen(view->container, true);