diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index 6dd036778..60b7b79f3 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -16,14 +16,6 @@
    [cuerdas.core :as str]
    #?(:clj [app.common.fressian :as fres])))
 
-;; === Constants
-
-(def hidden-token-theme-group
-  "")
-
-(def hidden-token-theme-name
-  "__PENPOT__HIDDEN__TOKEN__THEME__")
-
 ;; === Groups handling
 
 (def schema:groupable-item
@@ -263,6 +255,18 @@
 (defn token-theme-path [group name]
   (join-path [group name] theme-separator))
 
+(defn split-token-theme-path [path]
+  (split-path path theme-separator))
+
+(def hidden-token-theme-group
+  "")
+
+(def hidden-token-theme-name
+  "__PENPOT__HIDDEN__TOKEN__THEME__")
+
+(def hidden-token-theme-path
+  (token-theme-path hidden-token-theme-group hidden-token-theme-name))
+
 (defprotocol ITokenTheme
   (toggle-set [_ set-name] "togle a set used / not used in the theme")
   (theme-path [_] "get `token-theme-path` from theme")
diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 1bf96a760..2e69e5347 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -462,6 +462,15 @@
 (def workspace-token-theme-tree
   (l/derived #(or (some-> % ctob/get-theme-tree) []) tokens-lib))
 
+(def workspace-token-theme-tree-no-hidden
+  (l/derived (fn [lib]
+               (or
+                (some-> lib
+                        (ctob/delete-theme ctob/hidden-token-theme-group ctob/hidden-token-theme-name)
+                        (ctob/get-theme-tree))
+                []))
+             tokens-lib))
+
 (def workspace-token-themes
   (l/derived #(or (some-> % ctob/get-themes) []) tokens-lib))
 
@@ -477,6 +486,9 @@
 (def workspace-active-theme-paths
   (l/derived #(some-> % ctob/get-active-theme-paths) tokens-lib))
 
+(def workspace-active-theme-paths-no-hidden
+  (l/derived #(disj % ctob/hidden-token-theme-path) workspace-active-theme-paths))
+
 (def workspace-active-set-names
   (l/derived #(some-> % ctob/get-active-themes-set-names) tokens-lib))
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs b/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
index c8a30f678..46f8cdfd9 100644
--- a/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
@@ -17,15 +17,16 @@
    [app.main.ui.components.dropdown :refer [dropdown]]
    [app.main.ui.icons :as i]
    [app.util.dom :as dom]
-   [rumext.v2 :as mf]))
+   [rumext.v2 :as mf]
+   [cuerdas.core :as str]))
 
 (mf/defc themes-list
-  [{:keys [themes active-theme-ids on-close grouped?]}]
+  [{:keys [themes active-theme-paths on-close grouped?]}]
   (when (seq themes)
     [:ul
      (for [[_ {:keys [group name] :as theme}] themes
            :let [theme-id (ctob/theme-path theme)
-                 selected? (get active-theme-ids theme-id)]]
+                 selected? (get active-theme-paths theme-id)]]
        [:li {:key theme-id
              :class (stl/css-case
                      :checked-element true
@@ -39,37 +40,34 @@
         [:span {:class (stl/css :check-icon)} i/tick]])]))
 
 (mf/defc theme-options
-  [{:keys [on-close]}]
-  (let [active-theme-ids (dm/fixme (mf/deref refs/workspace-active-theme-paths))
-        theme-groups (mf/deref refs/workspace-token-theme-tree)]
-    [:ul
-     (for [[group themes] theme-groups]
-       [:li {:key group}
-        (when (seq group)
-          [:span {:class (stl/css :group)} group])
-        [:& themes-list {:themes themes
-                         :active-theme-ids active-theme-ids
-                         :on-close on-close
-                         :grouped? true}]])
-     [:li {:class (stl/css-case :checked-element true
-                                :checked-element-button true)
-           :on-click #(modal/show! :tokens/themes {})}
-      [:span "Edit themes"]
-      [:span {:class (stl/css :icon)} i/arrow]]]))
+  [{:keys [active-theme-paths themes on-close]}]
+  [:ul
+   (for [[group themes] themes]
+     [:li {:key group}
+      (when (seq group)
+        [:span {:class (stl/css :group)} group])
+      [:& themes-list {:themes themes
+                       :active-theme-paths active-theme-paths
+                       :on-close on-close
+                       :grouped? true}]])
+   [:li {:class (stl/css-case :checked-element true
+                              :checked-element-button true)
+         :on-click #(modal/show! :tokens/themes {})}
+    [:span "Edit themes"]
+    [:span {:class (stl/css :icon)} i/arrow]]])
 
 (mf/defc theme-select
   [{:keys []}]
   (let [;; Store
-        temp-theme-id (dm/legacy (mf/deref refs/workspace-temp-theme-id))
-        active-theme-ids (dm/legacy (-> (mf/deref refs/workspace-active-theme-paths)
-                                        (disj temp-theme-id)))
-        active-themes-count (count active-theme-ids)
-        themes (mf/deref refs/workspace-token-theme-tree)
+        active-theme-paths (mf/deref refs/workspace-active-theme-paths-no-hidden)
+        active-themes-count (count active-theme-paths)
+        themes (mf/deref refs/workspace-token-theme-tree-no-hidden)
 
         ;; Data
         current-label (cond
                         (> active-themes-count 1) (str active-themes-count " themes active")
-                        ;; (pos? active-themes-count) (get-in themes [(first active-theme-ids) :name])
+                        (= active-themes-count 1) (some-> (first active-theme-paths)
+                                                          (str/replace "/" " / "))
                         :else "No theme active")
 
         ;; State
@@ -90,4 +88,6 @@
      [:& dropdown {:show is-open? :on-close on-close-dropdown}
       [:div {:ref dropdown-element*
              :class (stl/css :custom-select-dropdown)}
-       [:& theme-options {:on-close on-close-dropdown}]]]]))
+       [:& theme-options {:active-theme-paths active-theme-paths
+                          :themes themes
+                          :on-close on-close-dropdown}]]]]))