diff --git a/types/wlr_subcompositor.c b/types/wlr_subcompositor.c
index 6ec8a397..69c66a65 100644
--- a/types/wlr_subcompositor.c
+++ b/types/wlr_subcompositor.c
@@ -367,6 +367,7 @@ void subsurface_handle_parent_commit(struct wlr_subsurface *subsurface) {
 		subsurface->added = true;
 		wl_signal_emit_mutable(&subsurface->parent->events.new_subsurface,
 			subsurface);
+		subsurface_consider_map(subsurface, true);
 	}
 }
 
@@ -414,8 +415,6 @@ static struct wlr_subsurface *subsurface_create(struct wlr_surface *surface,
 
 	surface->role_data = subsurface;
 
-	subsurface_consider_map(subsurface, true);
-
 	return subsurface;
 }