diff --git a/frontend/src/app/main/ui/workspace/tokens/management.cljs b/frontend/src/app/main/ui/workspace/tokens/management.cljs
index 0ff4deafa4..dcfa9403fa 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management.cljs
@@ -12,7 +12,7 @@
    [app.main.store :as st]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
    [app.main.ui.ds.foundations.typography.text :refer [text*]]
-   [app.main.ui.workspace.tokens.management.context-menu :refer [token-context-menu]]
+   [app.main.ui.workspace.tokens.management.context-menu :refer [token-context-menu*]]
    [app.main.ui.workspace.tokens.management.group :refer [token-group*]]
    [app.main.ui.workspace.tokens.management.node-context-menu :refer [token-node-context-menu*]]
    [app.util.array :as array]
@@ -189,7 +189,7 @@
             (st/emit! (dwtl/set-selected-token-set-id (ctob/get-id match)))))))
 
     [:*
-     [:& token-context-menu {:on-delete-token delete-token}]
+     [:> token-context-menu* {:on-delete-token delete-token}]
      [:> token-node-context-menu* {:on-delete-node delete-node}]
 
      [:> selected-set-info* {:tokens-lib tokens-lib
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
index 0dd980f73f..5546998baf 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
@@ -448,7 +448,7 @@
               :on-context-menu prevent-default}
          children]])]))
 
-(mf/defc menu-tree
+(mf/defc menu-tree*
   [{:keys [selected-shapes submenu-offset type errors] :as context-data}]
   (let [shape-types  (into #{} (map :type selected-shapes))
         editing-ref  (mf/deref refs/workspace-editor-state)
@@ -470,7 +470,7 @@
                                  :hint hint
                                  :no-selectable true
                                  :submenu-offset submenu-offset}
-                  [:& menu-tree (assoc context-data :type submenu)]]
+                  [:> menu-tree* (assoc context-data :type submenu)]]
          :else [:& menu-entry
                 {:title title
                  :on-click action
@@ -478,7 +478,7 @@
                  :no-selectable no-selectable
                  :selected? selected?}])])))
 
-(mf/defc token-context-menu-tree
+(mf/defc token-context-menu-tree*
   [{:keys [width errors on-delete-token] :as mdata}]
   (let [objects  (mf/deref refs/workspace-page-objects)
         selected (mf/deref refs/selected-shapes)
@@ -498,15 +498,15 @@
             (some #(ctsl/any-layout-immediate-child? objects %) selected-shapes)))]
 
     [:ul {:class (stl/css :context-list)}
-     [:& menu-tree {:submenu-offset width
-                    :token token
-                    :errors errors
-                    :selected-token-set-id selected-token-set-id
-                    :selected-shapes selected-shapes
-                    :is-selected-inside-layout is-selected-inside-layout
-                    :on-delete-token on-delete-token}]]))
+     [:> menu-tree* {:submenu-offset width
+                     :token token
+                     :errors errors
+                     :selected-token-set-id selected-token-set-id
+                     :selected-shapes selected-shapes
+                     :is-selected-inside-layout is-selected-inside-layout
+                     :on-delete-token on-delete-token}]]))
 
-(mf/defc token-context-menu
+(mf/defc token-context-menu*
   [{:keys [on-delete-token]}]
   (let [mdata               (mf/deref tokens-menu-ref)
         is-open?            (boolean mdata)
@@ -555,5 +555,5 @@
                         :left (dm/str left "px")}
                 :on-context-menu prevent-default}
           (when mdata
-            [:& token-context-menu-tree (assoc mdata :width @width :on-delete-token on-delete-token)])]])
+            [:> token-context-menu-tree* (assoc mdata :width @width :on-delete-token on-delete-token)])]])
        container))))