diff --git a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
index b1bb7e6ba..4c89178ae 100644
--- a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
@@ -31,7 +31,7 @@
 
 (mx/defc palette-item
   {:mixins [mx/static]}
-  [color]
+  [color position]
   (letfn [(select-color [event]
             (let [attrs (if (kbd/shift? event)
                           {:stroke-color color}
@@ -88,8 +88,12 @@
            [:div.btn-palette.create i/close]]]
 
        [:span.left-arrow {}
-        (when (> offset 0)
-          {:on-click #(swap! local update :offset (fnil dec 1))})
+        (if (> (:position @local) 0)
+          {:on-click #(swap! local update :position dec)}
+          {:class :disabled})
+        ;; FIXME Objects are not valid as a React child (found: :on-click).
+        ;;(when (> offset 0)
+        ;;  {:on-click #(swap! local update :offset (fnil dec 1))})
         i/arrow-slide]
 
        [:div.color-palette-content {:ref "container"}
@@ -100,9 +104,13 @@
                (mx/with-key color)))]]
 
        [:span.right-arrow
-        (if (< offset invisible)
-          {:on-click #(swap! local update :offset (fnil inc 0))}
-          {})
+        (if (< (* (+ 1 (:position @local)) 10) (count (:colors selected-coll)))
+          {:on-click #(swap! local update :position inc)}
+          {:class :disabled})
+        ;; FIXME Objects are not valid as a React child (found: :on-click).
+        ;;(if (< offset invisible)
+        ;;  {:on-click #(swap! local update :offset (fnil inc 0))}
+        ;;  {})
         i/arrow-slide]
        [:span.close-palette {:on-click close}
         i/close]])))