diff --git a/package-lock.json b/package-lock.json
index d5470719e..1303f168b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.5",
+  "version": "0.33.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/public/javascripts/services/tab_context.js b/src/public/javascripts/services/tab_context.js
index 5e781a859..9eaf6a22c 100644
--- a/src/public/javascripts/services/tab_context.js
+++ b/src/public/javascripts/services/tab_context.js
@@ -83,7 +83,11 @@ class TabContext {
 
         if (utils.isDesktop()) {
             // keyboard plugin is not loaded in mobile
-            this.$noteTitle.bind('keydown', 'return', () => this.getComponent().focus());
+            this.$noteTitle.bind('keydown', 'return', () => {
+                this.getComponent().focus();
+
+                return false; // to not propagate the enter into the editor (causes issues with codemirror)
+            });
         }
 
         this.$protectButton = this.$tabContent.find(".protect-button");