diff --git a/frontend/src/app/main/ui/modal.cljs b/frontend/src/app/main/ui/modal.cljs
index 768090cdd..a086af5f0 100644
--- a/frontend/src/app/main/ui/modal.cljs
+++ b/frontend/src/app/main/ui/modal.cljs
@@ -99,6 +99,5 @@
 (mf/defc modal
   []
   (let [modal (mf/deref modal-ref)]
-    (println "modal" modal)
     (when modal [:& modal-wrapper {:data modal
                                    :key (:id modal)}])))
diff --git a/frontend/src/app/main/ui/workspace/colorpicker.cljs b/frontend/src/app/main/ui/workspace/colorpicker.cljs
index e7a5a68f5..d66c04373 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker.cljs
@@ -101,10 +101,12 @@
   (let [value (if (uc/hex? value) value "#000000")
         [r g b] (uc/hex->rgb value)
         [h s v] (uc/hex->hsv value)]
+    
     {:hex (or value "000000")
      :alpha (or opacity 1)
      :r r :g g :b b
-     :h h :s s :v v}))
+     :h h :s s :v v}
+    ))
 
 (mf/defc colorpicker
   [{:keys [value opacity on-change on-accept]}]
@@ -177,12 +179,12 @@
      (fn [] (fn []
               (st/emit! (dwc/stop-picker))
               (when @value-ref
-                  (st/emit! (dwl/add-recent-color @value-ref))))))
+                (st/emit! (dwl/add-recent-color @value-ref))))))
 
     (mf/use-effect
      (mf/deps picking-color? picked-color)
      (fn [] (when picking-color?
-              (let [[r g b] picked-color
+              (let [[r g b] (or picked-color [0 0 0])
                     hex (uc/rgb->hex [r g b])
                     [h s v] (uc/hex->hsv hex)]
                 (swap! current-color assoc
@@ -387,10 +389,10 @@
                  :top (str (- y 50) "px")})
         ]
     [:div.colorpicker-tooltip
-      {:style (clj->js style)}
-      [:& colorpicker {:value (or value default)
-                       :opacity (or opacity 1)
-                       :on-change on-change
-                       :on-accept on-accept
-                       :disable-opacity disable-opacity}]]))
+     {:style (clj->js style)}
+     [:& colorpicker {:value (or value default)
+                      :opacity (or opacity 1)
+                      :on-change on-change
+                      :on-accept on-accept
+                      :disable-opacity disable-opacity}]]))