diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index 132b9377f..feb82914a 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -468,6 +468,10 @@
                (cond-> into-component?
                  (dissoc :component-root))
 
+               (cond-> (and (ctk/instance-head? obj)
+                            (not into-component?))
+                 (assoc :component-root true))
+
                (cond-> (or frame? group? bool?)
                  (assoc :shapes []))