diff --git a/src/uxbox/data/shapes.cljs b/src/uxbox/data/shapes.cljs
index e36cf3002..b94ad2d12 100644
--- a/src/uxbox/data/shapes.cljs
+++ b/src/uxbox/data/shapes.cljs
@@ -320,7 +320,9 @@
   (reify
     rs/UpdateEvent
     (-apply-update [_ state]
-      (assoc-in state [:workspace :selected] #{}))))
+      (-> state
+          (assoc-in [:workspace :selected] #{})
+          (assoc-in [:workspace :drawing] nil)))))
 
 (defn group-selected
   []