diff --git a/package-lock.json b/package-lock.json
index 3fd371fc6..d5470719e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.4",
+  "version": "0.33.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/public/javascripts/services/note_detail_text.js b/src/public/javascripts/services/note_detail_text.js
index de75a1763..9c8f1204c 100644
--- a/src/public/javascripts/services/note_detail_text.js
+++ b/src/public/javascripts/services/note_detail_text.js
@@ -74,7 +74,7 @@ class NoteDetailText {
     }
 
     focus() {
-        this.$component.focus();
+        this.$editorEl.focus();
     }
 
     getEditor() {
diff --git a/src/views/tabs.ejs b/src/views/tabs.ejs
index 6e68f3b7b..5f0c5560e 100644
--- a/src/views/tabs.ejs
+++ b/src/views/tabs.ejs
@@ -11,8 +11,8 @@
         <table class="note-detail-promoted-attributes"></table>
 
         <div class="note-detail-component-wrapper">
-            <div class="note-detail-text note-detail-component" tabindex="10000">
-                <div class="note-detail-text-editor"></div>
+            <div class="note-detail-text note-detail-component">
+                <div class="note-detail-text-editor" tabindex="10000"></div>
             </div>
 
             <div class="note-detail-code note-detail-component"></div>