diff --git a/src/uxbox/main/data/workspace.cljs b/src/uxbox/main/data/workspace.cljs
index 34c03dd873..5c92ab932d 100644
--- a/src/uxbox/main/data/workspace.cljs
+++ b/src/uxbox/main/data/workspace.cljs
@@ -109,9 +109,11 @@
   (reify
     rs/UpdateEvent
     (-apply-update [_ state]
-      (if (or (nil? shape) (= (get-in state [:workspace :drawing]) shape))
-        (update-in state [:workspace] dissoc :drawing)
-        (assoc-in state [:workspace :drawing] shape)))))
+      (let [current (get-in state [:workspace :drawing])]
+        (if (or (nil? shape)
+                (= shape current))
+          (update state :workspace dissoc :drawing)
+          (assoc-in state [:workspace :drawing] shape))))))
 
 ;; --- Activate Workspace Flag