diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
index 7682e22c3..476156b61 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
@@ -271,6 +271,11 @@
                              (mf/deps theme-state)
                              (fn [set-name]
                                (swap! theme-state #(ctob/toggle-set % set-name))))
+        on-click-token-set (mf/use-callback
+                            (mf/deps on-toggle-token-set)
+                            (fn [prefixed-set-path-str]
+                              (let [set-name (ctob/prefixed-set-path-string->set-name-string prefixed-set-path-str)]
+                                (on-toggle-token-set set-name))))
         on-change-field (fn [field value]
                           (swap! theme-state #(assoc % field value)))
         on-save-form (mf/use-callback
@@ -322,7 +327,7 @@
          {:token-sets token-sets
           :token-set-selected? (constantly false)
           :token-set-active? token-set-active?
-          :on-select on-toggle-token-set
+          :on-select on-click-token-set
           :on-toggle-token-set on-toggle-token-set
           :origin "theme-modal"
           :context sets-context/static-context}]]
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index fc969bdbe..7b15da0be 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -110,9 +110,7 @@
          (fn [event]
            (dom/stop-propagation event)
            (when-not editing?'
-             (on-toggle set-name)
              (on-select tree-path))))
-
         on-context-menu
         (mf/use-fn
          (mf/deps editing?' tree-path)
@@ -163,9 +161,9 @@
   [{:keys [set-path set-node tree-depth tree-path on-select selected? on-toggle active? editing? on-edit on-edit-reset on-edit-submit]
     :or {tree-depth 0}
     :as props}]
-  (let [[set-prefix set-path'] (some-> set-path (ctob/split-set-str-path-prefix))
+  (let [[set-path-prefix set-fname] (some-> set-path (ctob/split-set-str-path-prefix))
         set? (instance? ctob/TokenSet set-node)
-        set-group? (= ctob/set-group-prefix set-prefix)
+        set-group? (= ctob/set-group-prefix set-path-prefix)
         root? (= tree-depth 0)
         collapsed? (mf/use-state false)
         children? (and
@@ -180,7 +178,7 @@
          :active? active?
          :selected? (selected? tree-path)
          :on-select on-select
-         :label set-path'
+         :label set-fname
          :tree-path (or tree-path set-path)
          :tree-depth tree-depth
          :editing? editing?
@@ -192,7 +190,7 @@
        [:& sets-tree-set-group
         {:selected? (selected? tree-path)
          :on-select on-select
-         :label set-path'
+         :label set-fname
          :collapsed? collapsed?
          :tree-path (or tree-path set-path)
          :tree-depth tree-depth