diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs
index f8bc4d4993..7b42338ff5 100644
--- a/frontend/src/app/main/data/workspace/common.cljs
+++ b/frontend/src/app/main/data/workspace/common.cljs
@@ -511,7 +511,10 @@
   (ptk/reify ::clear-edition-mode
     ptk/UpdateEvent
     (update [_ state]
-      (update state :workspace-local dissoc :edition))))
+      (let [id (get-in state [:workspace-local :edition])]
+        (-> state
+            (update-in [:workspace-local :hover] disj id)
+            (update :workspace-local dissoc :edition))))))
 
 
 (defn add-shape