diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
index b7e2b9949..3f3b7d340 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
@@ -25,7 +25,9 @@
   [np op]
   (let [new-shape (obj/get np "shape")
         old-shape (obj/get op "shape")]
-    (and (identical? (:fill-color new-shape)
+    (and (= (:id new-shape)
+            (:id old-shape))
+         (identical? (:fill-color new-shape)
                      (:fill-color old-shape))
          (identical? (:fill-opacity new-shape)
                      (:fill-opacity old-shape)))))
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
index 33c7adfbe..a548e5ee8 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
@@ -25,7 +25,9 @@
   [np op]
   (let [new-shape (obj/get np "shape")
         old-shape (obj/get op "shape")]
-    (and (identical? (:stroke-style new-shape)
+    (and (= (:id new-shape)
+            (:id old-shape))
+         (identical? (:stroke-style new-shape)
                      (:stroke-style old-shape))
          (identical? (:stroke-alignment new-shape)
                      (:stroke-alignment old-shape))