diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
index ec4ea3804..ef4ba0e3e 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
@@ -109,12 +109,20 @@
                                   :tokens border-radius-tokens
                                   :attributes (wtc/token-attributes :border-radius)}))
         sizing-tokens (:sizing tokens-by-type)
-        sizing-options (mf/use-memo
+        width-options (mf/use-memo
+                       (mf/deps shape sizing-tokens)
+                       #(wtc/tokens-name-map->select-options
+                         {:shape shape
+                          :tokens sizing-tokens
+                          :attributes (wtc/token-attributes :sizing)
+                          :selected-attributes #{:width}}))
+        height-options (mf/use-memo
                         (mf/deps shape sizing-tokens)
                         #(wtc/tokens-name-map->select-options
                           {:shape shape
                            :tokens sizing-tokens
-                           :attributes (wtc/token-attributes :sizing)}))
+                           :attributes (wtc/token-attributes :sizing)
+                           :selected-attributes #{:height}}))
 
         flex-child?       (->> selection-parents (some ctl/flex-layout?))
         absolute?         (ctl/item-absolute? shape)
@@ -235,7 +243,7 @@
                        (dch/update-shapes ids
                                           (if token-value
                                             #(assoc-in % [:applied-tokens attr] (:id value))
-                                            #(dissoc % :applied-tokens attr))
+                                            #(d/dissoc-in % [:applied-tokens attr]))
                                           {:reg-objects? true
                                            :attrs [:applied-tokens]})
                        (udw/update-dimensions ids attr (or token-value value))))))
@@ -450,7 +458,7 @@
            :input-class (stl/css :numeric-input)
            :on-change on-width-change
            :on-token-remove #(on-width-change (wtc/maybe-resolve-token-value %))
-           :options sizing-options
+           :options width-options
            :position :left
            :type "number"
            :value (:width values)}]]
@@ -458,13 +466,19 @@
                                     :disabled disabled-height-sizing?)
                :title (tr "workspace.options.height")}
          [:span {:class (stl/css :icon-text)} "H"]
-         [:> numeric-input* {:min 0.01
-                             :no-validate true
-                             :placeholder (if (= :multiple (:height values)) (tr "settings.multiple") "--")
-                             :on-change on-height-change
-                             :disabled disabled-height-sizing?
-                             :className (stl/css :numeric-input)
-                             :value (:height values)}]]
+         [:& editable-select
+          {:placeholder (if (= :multiple (:rx values)) (tr "settings.multiple") "--")
+           :no-validate true
+           :min 0.01
+           :class (stl/css :token-select)
+           :disabled disabled-height-sizing?
+           :input-class (stl/css :numeric-input)
+           :on-change on-height-change
+           :on-token-remove #(on-height-change (wtc/maybe-resolve-token-value %))
+           :options height-options
+           :position :right
+           :type "number"
+           :value (:height values)}]]
         [:button {:class (stl/css-case
                           :lock-size-btn true
                           :selected (true? proportion-lock)
diff --git a/frontend/src/app/main/ui/workspace/tokens/core.cljs b/frontend/src/app/main/ui/workspace/tokens/core.cljs
index d44b83ba5..0b972f61d 100644
--- a/frontend/src/app/main/ui/workspace/tokens/core.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/core.cljs
@@ -63,11 +63,11 @@
       (get token-type [])
       (tokens-name-map)))
 
-(defn tokens-name-map->select-options [{:keys [shape tokens attributes]}]
+(defn tokens-name-map->select-options [{:keys [shape tokens attributes selected-attributes]}]
   (->> (tokens-name-map tokens)
        (map (fn [[_k {:keys [name] :as item}]]
               (cond-> (assoc item :label name)
-                (token-applied? item shape attributes) (assoc :selected? true))))))
+                (token-applied? item shape (or selected-attributes attributes)) (assoc :selected? true))))))
 
 ;; Update functions ------------------------------------------------------------