diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs
index d09f5b4317..536683e82b 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs
@@ -7,7 +7,10 @@
    [app.main.ui.components.numeric-input :refer [numeric-input*]]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*]]
+   [app.main.ui.hooks :as hooks]
    [app.util.i18n :as i18n :refer [tr]]
+   [beicon.v2.core :as rx]
+   [potok.v2.core :as ptk]
    [rumext.v2 :as mf]))
 
 (defn all-equal?
@@ -58,7 +61,19 @@
         on-radius-r1-change #(on-radius-4-change % :r1)
         on-radius-r2-change #(on-radius-4-change % :r2)
         on-radius-r3-change #(on-radius-4-change % :r3)
-        on-radius-r4-change #(on-radius-4-change % :r4)]
+        on-radius-r4-change #(on-radius-4-change % :r4)
+
+        expand-stream
+        (mf/with-memo []
+          (->> st/stream
+               (rx/filter (ptk/type? :expand-border-radius))))]
+
+    (hooks/use-stream
+     expand-stream
+     #(reset! radius-expanded* true))
+
+    (mf/with-effect [ids]
+      (reset! radius-expanded* false))
 
     [:div {:class (stl/css :radius)}
      (if (not radius-expanded)
diff --git a/frontend/src/app/main/ui/workspace/tokens/changes.cljs b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
index a6219c87a4..2083dd558a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/changes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
@@ -16,6 +16,7 @@
    [app.main.data.workspace.state-helpers :as wsh]
    [app.main.data.workspace.transforms :as dwt]
    [app.main.data.workspace.undo :as dwu]
+   [app.main.store :as st]
    [app.main.ui.workspace.tokens.style-dictionary :as sd]
    [app.main.ui.workspace.tokens.tinycolor :as tinycolor]
    [app.main.ui.workspace.tokens.token :as wtt]
@@ -99,6 +100,8 @@
                        :attrs ctt/border-radius-keys}))
 
 (defn update-shape-radius-single-corner [value shape-ids attributes]
+  ;; NOTE: This key should be namespaced on data tokens, but these events are not there.  
+  (st/emit! (ptk/data-event :expand-border-radius))
   (dwsh/update-shapes shape-ids
                       (fn [shape]
                         (when (ctsr/can-get-border-radius? shape)