diff --git a/frontend/src/app/main/ui/workspace/top_toolbar.cljs b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
index 615e0921b1..8236d21ee3 100644
--- a/frontend/src/app/main/ui/workspace/top_toolbar.cljs
+++ b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
@@ -318,11 +318,9 @@
            (let [tool (-> (dom/get-current-target event)
                           (dom/get-data "tool")
                           (keyword))]
-             (st/emit! :interrupt (dw/clear-edition-mode))
-
-             ;; Delay so anything that launched :interrupt can finish
-             (ts/schedule 100
-                          #(st/emit! (dw/select-for-drawing tool))))))
+             (st/emit! :interrupt
+                       (dw/clear-edition-mode)
+                       (dw/select-for-drawing tool)))))
 
         on-toggle-toolbar
         (mf/use-fn