diff --git a/frontend/src/app/main/data/workspace/drawing/common.cljs b/frontend/src/app/main/data/workspace/drawing/common.cljs
index f31d5be14..92db09960 100644
--- a/frontend/src/app/main/data/workspace/drawing/common.cljs
+++ b/frontend/src/app/main/data/workspace/drawing/common.cljs
@@ -28,7 +28,6 @@
     (watch [_ state stream]
       (let [shape (get-in state [:workspace-drawing :object])]
         (rx/concat
-         (rx/of clear-drawing)
          (when (:initialized? shape)
            (let [page-id (:current-page-id state)
                  shape-click-width (case (:type shape)
@@ -65,4 +64,8 @@
                                :page-id page-id
                                :rect (:selrect shape)})
                      (rx/map #(dwc/move-shapes-into-frame (:id shape) %)))
-                (rx/empty))))))))))
+                (rx/empty)))))
+
+         ;; Delay so the mouse event can read the drawing state
+         (->> (rx/of clear-drawing)
+              (rx/delay 0)))))))
diff --git a/frontend/src/app/main/ui/workspace/viewport/actions.cljs b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
index f7550428f..2b6d7d25b 100644
--- a/frontend/src/app/main/ui/workspace/viewport/actions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
@@ -142,7 +142,7 @@
                     (not selected?)
                     (not edition)
                     (not drawing-path?)
-                    (not (#{:comments :path} drawing-tool)))
+                    (not drawing-tool))
            (st/emit! (dw/select-shape (:id @hover)))))))))
 
 (defn on-double-click
diff --git a/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs b/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs
index 92213c131..79b41e0d3 100644
--- a/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs
@@ -99,7 +99,8 @@
            (timers/schedule
             (fn []
               (st/emit! (dwc/update-shapes [@shape-id]
-                                           #(assoc % :thumbnail data)))
+                                           #(assoc % :thumbnail data)
+                                           {:save-undo? false}))
               (rx/push! next :next)))))
 
         on-frame-not-found