diff --git a/CHANGES.md b/CHANGES.md
index 033dcc348..3deefff77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -92,6 +92,8 @@
 - Fix unnecessary button [Taiga #3312](https://tree.taiga.io/project/penpot/issue/3312)
 - Fix copy color information in several formats [Taiga #4723](https://tree.taiga.io/project/penpot/issue/4723)
 - Fix dropdown width [Taiga #5541](https://tree.taiga.io/project/penpot/issue/5541)
+- Fix enable comment mode and insert image keeps on comment mode [Taiga #5678](https://tree.taiga.io/project/penpot/issue/5678)
+
 ### :arrow_up: Deps updates
 
 - Update google fonts catalog (at 2023/07/06) [Taiga #5592](https://tree.taiga.io/project/penpot/issue/5592)
diff --git a/frontend/src/app/main/ui/workspace/left_toolbar.cljs b/frontend/src/app/main/ui/workspace/left_toolbar.cljs
index 6439725af..2a61a3120 100644
--- a/frontend/src/app/main/ui/workspace/left_toolbar.cljs
+++ b/frontend/src/app/main/ui/workspace/left_toolbar.cljs
@@ -30,7 +30,10 @@
         file-id (mf/use-ctx ctx/current-file-id)
 
         on-click
-        (mf/use-fn #(dom/click (mf/ref-val ref)))
+        (mf/use-fn 
+          (fn []
+            (st/emit! :interrupt dw/clear-edition-mode)
+            (dom/click (mf/ref-val ref))))
 
         on-selected
         (mf/use-fn