                         (get-in [:workspace-drawing :object])
                         (geom/setup {:x (:x initial) :y (:y initial) :width 1 :height 1})
                         (assoc :frame-id fid)
-                        (assoc ::initialized? true))]
+                        (assoc ::initialized? true)
+                        (assoc ::click-draw? true))]
           (rx/concat
            ;; Add shape to drawing state
            (rx/of #(assoc-in state [:workspace-drawing :object] shape))

                          #(update-in % [:workspace-drawing :object] assoc :x x :y y))))

           (->> ms/mouse-position
                (rx/with-latest vector ms/mouse-position-ctrl)
                (rx/switch-map
                 (fn [[point :as current]]

                              (gpt/point v v))
                            scalev)]
              (-> shape
                  (assoc ::click-draw? false)
                  (assoc-in [:modifiers :resize-vector] scalev)
                  (assoc-in [:modifiers :resize-origin] (gpt/point x y))
                  (assoc-in [:modifiers :resize-rotation] 0))))
