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
   []
diff --git a/src/uxbox/ui/workspace/drawarea.cljs b/src/uxbox/ui/workspace/drawarea.cljs
index 9fc32e28e..312ee3589 100644
--- a/src/uxbox/ui/workspace/drawarea.cljs
+++ b/src/uxbox/ui/workspace/drawarea.cljs
@@ -89,8 +89,7 @@
   (let [{:keys [x y]} (gpt/divide @wb/mouse-canvas-a @wb/zoom-l)
         props {:x1 x :y1 y :x2 (+ x 100) :y2 (+ y 100)}
         shape (ush/initialize shape props)]
-    (rs/emit! (uds/add-shape shape)
-              (udw/select-for-drawing nil))))
+    (rs/emit! (uds/add-shape shape))))
 
 (defn- initialize-shape-drawing
   "A drawing handler for generic shapes such as rect, circle, text, etc."
@@ -103,8 +102,7 @@
             (let [shape @drawing-shape
                   shpos @drawing-position
                   shape (ush/resize shape shpos)]
-              (rs/emit! (uds/add-shape shape)
-                        (udw/select-for-drawing nil))
+              (rs/emit! (uds/add-shape shape))
               (reset! drawing-position nil)
               (reset! drawing-shape nil)))]