diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index 44d913c45..dd8d89474 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -180,7 +180,7 @@
                           (ensure-token-theme-changes state {:id (:id new-token-set)
                                                              :new-set? true}))]
           (rx/of
-           (set-selected-token-set-id (:id new-token-set))
+           (set-selected-token-set-id (:name new-token-set))
            (dch/commit-changes changes)))))))
 
 (defn update-token-set [token-set]
@@ -251,7 +251,7 @@
                                 (ensure-token-theme-changes state {:new-set? create-set?
                                                                    :id (:id token-set)}))]
           (rx/of
-           (set-selected-token-set-id (:id token-set))
+           (set-selected-token-set-id (:name token-set))
            (dch/commit-changes changes)))))))
 
 (defn delete-token
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index 994214ed2..fade69a90 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -23,8 +23,8 @@
 (defn on-toggle-token-set-click [token-set-id]
   (st/emit! (wdt/toggle-token-set {:token-set-id token-set-id})))
 
-(defn on-select-token-set-click [id]
-  (st/emit! (wdt/set-selected-token-set-id id)))
+(defn on-select-token-set-click [name]
+  (st/emit! (wdt/set-selected-token-set-id name)))
 
 (defn on-delete-token-set-click [id name event]
   (dom/stop-propagation event)
@@ -83,7 +83,7 @@
                    (fn [event]
                      (dom/stop-propagation event)
                      (when-not editing-node?
-                       (on-select id))))
+                       (on-select name))))
         on-context-menu (mf/use-callback
                          (mf/deps editing-node? id)
                          (fn [event]
@@ -179,8 +179,8 @@
         selected-token-set-id (mf/deref refs/workspace-selected-token-set-id)
         token-set-selected? (mf/use-callback
                              (mf/deps selected-token-set-id)
-                             (fn [id]
-                               (= id selected-token-set-id)))
+                             (fn [set-name]
+                               (= set-name selected-token-set-id)))
         active-token-set-ids (mf/deref refs/workspace-active-set-ids)
         token-set-active? (mf/use-callback
                            (mf/deps active-token-set-ids)
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 c20898d74..529c13cd5 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
@@ -168,7 +168,7 @@
 ;; === Set selection
 
 (defn get-selected-token-set-id [state]
-  (or (dm/legacy (get-in state [:workspace-local :selected-token-set-id]))
+  (or (get-in state [:workspace-local :selected-token-set-id])
       (some-> (get-workspace-tokens-lib state)
               (ctob/get-sets)
               (first)