diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7bba29234..d52bed51e 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -743,10 +743,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 		&view->surface_new_subsurface);
 	view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
 
-	if (decoration) {
-		view_update_csd_from_client(view, decoration);
-	}
-
 	if (view->impl->wants_floating && view->impl->wants_floating(view)) {
 		view->container->border = config->floating_border;
 		view->container->border_thickness = config->floating_border_thickness;
@@ -757,6 +753,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 		view_set_tiled(view, true);
 	}
 
+	if (decoration) {
+		view_update_csd_from_client(view, decoration);
+	}
+
 	if (config->popup_during_fullscreen == POPUP_LEAVE &&
 			view->container->workspace &&
 			view->container->workspace->fullscreen &&