diff --git a/frontend/src/app/main/ui/workspace/tokens/token_set.cljs b/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
index db3f3c626c..b144c919d0 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
@@ -14,7 +14,7 @@
 (defn get-workspace-ordered-themes [state]
   (let [themes (get-workspace-themes state)
         themes-index (get-workspace-themes-index state)]
-    (->> (map #(get themes-index (:id %)) themes)
+    (->> (map #(get themes-index %) themes)
          (group-by :group))))
 
 (defn theme-selected? [theme]