diff --git a/app/assets/javascripts/ui_models/app_state/notes_view_state.ts b/app/assets/javascripts/ui_models/app_state/notes_view_state.ts
index 62a5f6047..e578e1a29 100644
--- a/app/assets/javascripts/ui_models/app_state/notes_view_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/notes_view_state.ts
@@ -318,7 +318,7 @@ export class NotesViewState {
     }
   };
 
-  createNewNote = async (focusNewNote = true) => {
+  createNewNote = async () => {
     this.appState.notes.unselectNotes();
     let title = `Note ${this.notes.length + 1}`;
     if (this.isFiltering) {
@@ -327,10 +327,6 @@ export class NotesViewState {
     await this.appState.createEditor(title);
     this.reloadNotes();
     this.appState.noteTags.reloadTags();
-    const noteTitleEditorElement = document.getElementById('note-title-editor');
-    if (focusNewNote) {
-      noteTitleEditorElement?.focus();
-    }
   };
 
   createPlaceholderNote = () => {
@@ -338,7 +334,7 @@ export class NotesViewState {
     if (selectedTag && selectedTag.isSmartTag && !selectedTag.isAllTag) {
       return;
     }
-    return this.createNewNote(false);
+    return this.createNewNote();
   };
 
   get optionsSubtitle(): string {
diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts
index 5289cd670..23ddc4409 100644
--- a/app/assets/javascripts/views/editor/editor_view.ts
+++ b/app/assets/javascripts/views/editor/editor_view.ts
@@ -183,6 +183,12 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
     if (this.note.dirty) {
       this.showSavingStatus();
     }
+
+    if (this.editor.isTemplateNote) {
+      this.$timeout(() => {
+        this.focusTitle();
+      });
+    }
   }
 
   private onNoteChanges(note: SNNote, source: PayloadSource): void {