diff --git a/sway/tree/view.c b/sway/tree/view.c
index 4c46d0e97..e890f4f33 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -605,7 +605,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
 	view_update_title(view, false);
 	container_update_representation(view->container);
-	view_execute_criteria(view);
 
 	if (decoration) {
 		view_update_csd_from_client(view, decoration);
@@ -622,6 +621,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 		}
 	}
 
+	view_execute_criteria(view);
+
 	if (should_focus(view)) {
 		input_manager_set_focus(&view->container->node);
 	}