diff --git a/frontend/src/app/main/ui/ds/controls/numeric_input.cljs b/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
index 7c24fc1310..8a20573119 100644
--- a/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
+++ b/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
@@ -433,7 +433,8 @@
                        token (get-option-by-name options name)]
                    (if token
                      (apply-token (:resolved-value token) name)
-                     (apply-value (mf/ref-val last-value*)))))
+                     (apply-value (mf/ref-val last-value*))))
+                 (reset! is-open* false))
 
                enter?
                (if is-open
@@ -705,7 +706,9 @@
         token-props
         (when (and token-applied-name (not= :multiple token-applied-name))
           (let [token       (get-option-by-name dropdown-options token-applied-name)
-                id          (get token :id)
+                id          (or (get token :id)
+                                (some-> (get token-applied :id)
+                                        (dm/str)))
                 label       (or (get token :name) applied-token-name)
                 token-value (or (get token :resolved-value)
                                 (or (mf/ref-val last-value*)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
index 0e6a28612a..723a658466 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
@@ -205,8 +205,6 @@
      (when (some? on-reorder)
        [:> reorder-handler* {:ref dref}])
 
-     (prn "stroke-row*" applied-tokens)
-
      ;; Stroke Color
      ;; FIXME: memorize stroke color
      [:div {:class (stl/css :stroke-color-actions)}
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
index 39a4675dc0..510257b3ca 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs
@@ -39,9 +39,17 @@
            (not-empty)))))
 
 (defn- extract-partial-brace-text
+  "Returns the substring after the last '{' in s. If the resulting
+  substring ends with '}', that trailing brace is removed.
+  Returns nil if no '{' is found or s is nil."
   [s]
   (when-let [start (str/last-index-of s "{")]
-    (subs s (inc start))))
+    (let [partial (subs s (inc start))]
+      (if (and (seq partial)
+               (> (count partial) 0)
+               (= "}" (subs partial (dec (count partial)))))
+        (subs partial 0 (dec (count partial)))
+        partial))))
 
 (defn- filter-token-groups-by-name
   [tokens filter-text]