diff --git a/CHANGES.md b/CHANGES.md
index 5ec9ccca7..ffe137f5f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,6 +40,7 @@
 - Fix show in view mode and interactions workflow [Taiga #4711](https://github.com/penpot/penpot/pull/4711)
 - Fix internal error when I set up a stroke for some objects without and with stroke [Taiga #7558](https://tree.taiga.io/project/penpot/issue/7558)
 - Toolbar keeps toggling on and off on spacebar press [Taiga #7654](https://github.com/penpot/penpot/pull/7654)
+- Fix toolbar keeps hiding when click outside workspace [Taiga #7776](https://tree.taiga.io/project/penpot/issue/7776)
 
 ## 2.0.3
 
diff --git a/frontend/src/app/main/data/workspace/path/helpers.cljs b/frontend/src/app/main/data/workspace/path/helpers.cljs
index 2facaf53a..b52ab6e72 100644
--- a/frontend/src/app/main/data/workspace/path/helpers.cljs
+++ b/frontend/src/app/main/data/workspace/path/helpers.cljs
@@ -22,6 +22,7 @@
     (or (= type ::common/finish-path)
         (= type :app.main.data.workspace.path.shortcuts/esc-pressed)
         (= type :app.main.data.workspace.common/clear-edition-mode)
+        (= type :app.main.data.workspace.edition/clear-edition-mode)
         (= type :app.main.data.workspace/finalize-page)
         (= event :interrupt) ;; ESC
         (and ^boolean (mse/mouse-event? event)