diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
index 9755ede9a..46f7609e3 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
@@ -310,7 +310,7 @@
         [:ul {:class (stl/css :token-context-submenu)
               :data-direction submenu-direction
               :ref submenu-ref
-              ;; Under review: This distances are arbitrary, 
+              ;; Under review: This distances are arbitrary,
               ;; https://tree.taiga.io/project/penpot/task/9627
               :style {:display "none"
                       :--dist (if (= submenu-direction "down")
diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index 740b24e4a..af0c8a91b 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -8,6 +8,7 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.types.tokens-lib :as ctob]
    [app.main.data.modal :as modal]
    [app.main.data.notifications :as ntf]
@@ -243,13 +244,16 @@
 
         selected-token-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
 
+        selected-token-set-path (mf/deref refs/workspace-selected-token-set-path)
+
         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
-                    :title "TOKENS"}]
+                    :title (dm/str "TOKENS - " (ctob/set-path->set-name selected-token-set-path))}]
+
      (for [{:keys [token-key token-type-props tokens]} (concat (:filled token-groups)
                                                                (:empty token-groups))]
        [:& token-component {:key token-key