diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs
index 56affc085e..344284b5d7 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame_grid.cljs
@@ -67,7 +67,9 @@
         (fn [type]
           (let [defaults (type default-grid-params)
                 keys (keys defaults)
-                params (->> @state :changes params (select-keys keys) (merge defaults))
+                current-changes (-> @state :changes :params (select-keys keys))
+                ;; We give more priority to the current changes
+                params (merge defaults current-changes)
                 to-merge {:type type :params params}]
             (emit-changes! #(d/deep-merge % to-merge))))
 
diff --git a/frontend/src/uxbox/util/color.cljs b/frontend/src/uxbox/util/color.cljs
index f4a7c3f616..60b75064a6 100644
--- a/frontend/src/uxbox/util/color.cljs
+++ b/frontend/src/uxbox/util/color.cljs
@@ -31,7 +31,9 @@
 
 (defn hex->rgb
   [v]
-  (into [] (gcolor/hexToRgb v)))
+  (try
+    (into [] (gcolor/hexToRgb v))
+    (catch js/Object e [0 0 0])))
 
 (defn rgb->hex
   [[r g b]]