diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
index 05665e2126..0c91cfffaa 100644
--- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs
+++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs
@@ -434,6 +434,12 @@
   (let [component-shape (d/seek #(= (:shape-ref %)
                                     (:shape-ref shape))
                                 (vals (:objects component)))
+        root-shape (if (:component-id shape)
+                     shape
+                     root-shape)
+        root-component (if (:component-id shape)
+                         component-shape
+                         root-component)
 
         [rchanges uchanges]
         (update-attrs shape
@@ -541,6 +547,12 @@
   (let [component-shape (d/seek #(= (:shape-ref %)
                                     (:shape-ref shape))
                                 (vals (:objects component)))
+        root-shape (if (:component-id shape)
+                     shape
+                     root-shape)
+        root-component (if (:component-id shape)
+                         component-shape
+                         root-component)
 
         [rchanges uchanges]
         (update-attrs component-shape