diff --git a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
index 0a56a1ce7..90834ff56 100644
--- a/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/editable_select.cljs
@@ -249,8 +249,8 @@
                                 :type type})])
 
      (when (seq options)
-       [:span {:class (stl/css :dropdown-button)
-               :on-click toggle-dropdown}
+       [:div {:class (stl/css :dropdown-button)
+              :on-click toggle-dropdown}
         i/arrow])
 
      (when (and is-open? (seq options))
diff --git a/frontend/src/app/main/ui/workspace/tokens/editable_select.scss b/frontend/src/app/main/ui/workspace/tokens/editable_select.scss
index 2aa324a1e..4fbd3e593 100644
--- a/frontend/src/app/main/ui/workspace/tokens/editable_select.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/editable_select.scss
@@ -30,6 +30,7 @@
   .dropdown-button {
     @include flexCenter;
     margin-right: -$s-8;
+    padding-right: $s-8;
     padding-left: 0;
     aspect-ratio: 0.8 / 1;
     width: auto;