diff --git a/src/uxbox/data/shapes.cljs b/src/uxbox/data/shapes.cljs
index 3da7c1921..b552a6883 100644
--- a/src/uxbox/data/shapes.cljs
+++ b/src/uxbox/data/shapes.cljs
@@ -184,7 +184,7 @@
       (update-in state [:shapes-by-id sid]
                  merge
                  (when color {:fill color})
-                 (when opacity {:opacity opacity})))))
+                 (when opacity {:fill-opacity opacity})))))
 
 (defn update-font-attrs
   [sid {:keys [family style weight size align
diff --git a/src/uxbox/ui/shapes/core.cljs b/src/uxbox/ui/shapes/core.cljs
index 7de621267..0851d8492 100644
--- a/src/uxbox/ui/shapes/core.cljs
+++ b/src/uxbox/ui/shapes/core.cljs
@@ -74,7 +74,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def ^:static ^:private +style-attrs+
-  #{:fill :opacity :stroke :stroke-opacity :stroke-width :stroke-type :rx :ry})
+  #{:fill :fill-opacity :opacity :stroke :stroke-opacity
+    :stroke-width :stroke-type :rx :ry})
 
 (defn- transform-stroke-type
   [attrs]
diff --git a/src/uxbox/ui/workspace/sidebar/options.cljs b/src/uxbox/ui/workspace/sidebar/options.cljs
index 9cd9e577f..819757676 100644
--- a/src/uxbox/ui/workspace/sidebar/options.cljs
+++ b/src/uxbox/ui/workspace/sidebar/options.cljs
@@ -185,7 +185,7 @@
          {:type "range"
           :min "0"
           :max "1"
-          :value (:opacity shape "1")
+          :value (:fill-opacity shape "1")
           :step "0.0001"
           :on-change on-opacity-change}]]]])))