diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index 5f54a9047..71f06b614 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -260,8 +260,12 @@
         active-theme-tokens (sd/use-active-theme-sets-tokens)
 
         tokens (sd/use-resolved-workspace-tokens)
-        token-groups (mf/with-memo [tokens]
-                       (sorted-token-groups tokens))]
+
+        selected-token-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
+
+        token-groups (mf/with-memo [tokens selected-token-set-tokens]
+                       (-> (select-keys tokens (keys selected-token-set-tokens))
+                           (sorted-token-groups)))]
     [:*
      [:& token-context-menu]
      [:& title-bar {:all-clickable true
diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
index e2c77d007..25da4fbbb 100644
--- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
@@ -252,8 +252,10 @@
     @tokens-state))
 
 (defn use-resolved-workspace-tokens []
-  (-> (mf/deref refs/workspace-selected-token-set-tokens)
-      (use-resolved-tokens)))
+  (let [active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens)
+        selected-token-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
+        prefer-selected-token-set-tokens (merge active-theme-tokens selected-token-set-tokens)]
+    (use-resolved-tokens prefer-selected-token-set-tokens)))
 
 (defn use-active-theme-sets-tokens []
   (-> (mf/deref refs/workspace-active-theme-sets-tokens)