diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
index f1a708d8c0..1a1bad3068 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
@@ -54,6 +54,9 @@
         strokes         (:strokes values)
         has-strokes?    (or (= :multiple strokes) (some? (seq strokes)))
 
+        strokes
+        (mf/with-memo [strokes]
+          (into [] d/xf:add-index strokes))
 
         on-color-change
         (mf/use-fn
@@ -206,7 +209,7 @@
                              :icon i/remove}]]
           (seq strokes)
           [:> h/sortable-container* {}
-           (for [[index value] (d/enumerate (:strokes values []))]
+           (for [{:keys [::d/index] :as value} strokes]
              [:> stroke-row* {:key (dm/str "stroke-" index)
                               :stroke value
                               :title (tr "workspace.options.stroke-color")