diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls.cljs
index 40097461a8..47200e365a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls.cljs
@@ -19,4 +19,4 @@
 
 (dm/export select/select-indexed*)
 
-(dm/export combobox/combobox*)
\ No newline at end of file
+(dm/export combobox/value-combobox*)
\ No newline at end of file
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs
index e4a50f2e1f..ee471957f9 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs
@@ -61,7 +61,7 @@
                 (rx/of {:value resolved-value})
                 (rx/of {:error (first errors)}))))))))
 
-(mf/defc combobox*
+(mf/defc value-combobox*
   [{:keys [name tokens token token-type empty-to-end ref] :rest props}]
 
   (let [form              (mf/use-ctx fc/context)
@@ -144,7 +144,7 @@
              (reset! filter-term* "")
              (reset! is-open* false))))
 
-        {:keys [focused-id  on-key-down]}
+        {:keys [focused-id on-key-down]}
         (use-navigation
          {:is-open is-open
           :nodes-ref nodes-ref
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/form_container.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/form_container.cljs
index d19f43b5b2..0e6d55df03 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/form_container.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/form_container.cljs
@@ -43,7 +43,7 @@
         text-decoration-props (mf/spread-props props {:input-value-placeholder (tr "workspace.tokens.text-decoration-value-enter")})
         font-weight-props (mf/spread-props props {:input-value-placeholder (tr "workspace.tokens.font-weight-value-enter")})
         border-radius-props (if (contains? cf/flags :token-combobox)
-                              (mf/spread-props props {:input-component token.controls/combobox*})
+                              (mf/spread-props props {:input-component token.controls/value-combobox*})
                               props)]
 
     (case token-type