diff --git a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
index 9f1a0ab873..7a25682209 100644
--- a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
@@ -164,14 +164,16 @@
            (let [name-input     (mf/ref-val ref)
                  name           (str/trim (dom/get-value name-input))]
              (reset! edition* false)
-             (st/emit! (dw/end-rename-shape frame-id name)))))
+             (st/emit! (dw/end-rename-shape frame-id name))
+             (on-frame-leave frame-id))))
 
         cancel-edit
         (mf/use-fn
          (mf/deps frame-id)
          (fn []
            (reset! edition* false)
-           (st/emit! (dw/end-rename-shape frame-id nil))))
+           (st/emit! (dw/end-rename-shape frame-id nil))
+           (on-frame-leave frame-id)))
 
         on-key-down
         (mf/use-fn