diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
index 33ba86b5bb..eaf6763fcf 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
@@ -258,7 +258,7 @@
         lib (make-lib-with-theme current-theme ordered-token-sets)
 
         ;; Form / Modal handlers
-        on-back #(set-state (constantly {:type :themes-overview}))
+        on-back (mf/use-fn #(set-state (constantly {:type :themes-overview})))
         disabled? (-> (:name current-theme)
                       (str/trim)
                       (str/empty?))