diff --git a/frontend/src/app/main/data/workspace/notifications.cljs b/frontend/src/app/main/data/workspace/notifications.cljs
index 440b2496e3..35c4f53d35 100644
--- a/frontend/src/app/main/data/workspace/notifications.cljs
+++ b/frontend/src/app/main/data/workspace/notifications.cljs
@@ -24,6 +24,7 @@
    [app.main.data.workspace.layout :as dwly]
    [app.main.data.workspace.libraries :as dwl]
    [app.main.data.workspace.texts :as dwt]
+   [app.main.data.workspace.tokens.propagation :as dwtp]
    [app.main.router :as rt]
    [app.util.globals :refer [global]]
    [app.util.mouse :as mse]
@@ -334,4 +335,5 @@
     (watch [_ state _]
       (when (contains? (:files state) file-id)
         (rx/of (dwl/ext-library-changed file-id modified-at revn changes)
-               (dwl/notify-sync-file))))))
+               (dwl/notify-sync-file)
+               (dwtp/propagate-workspace-tokens))))))
diff --git a/frontend/src/app/main/data/workspace/tokens/application.cljs b/frontend/src/app/main/data/workspace/tokens/application.cljs
index d17d5131c1..e9ac2251ea 100644
--- a/frontend/src/app/main/data/workspace/tokens/application.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/application.cljs
@@ -25,7 +25,7 @@
    [app.main.data.style-dictionary :as sd]
    [app.main.data.tinycolor :as tinycolor]
    [app.main.data.tokenscript :as ts]
-   [app.main.data.workspace :as udw]
+  ;;  [app.main.data.workspace :as udw]
    [app.main.data.workspace.colors :as wdc]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.shapes :as dwsh]
@@ -93,7 +93,8 @@
    (ptk/reify ::update-shape-rotation
      ptk/WatchEvent
      (watch [_ _ _]
-       (when (number? value)
+       ;; TODOstatus see a way of avoiding the circular dependency of using here main.data.workspace
+       #_(when (number? value)
          (rx/of
           (udw/trigger-bounding-box-cloaking shape-ids)
           (udw/increase-rotation shape-ids value nil