diff --git a/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts b/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
index 0e9014bb9..1feba7e1b 100644
--- a/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
+++ b/app/assets/javascripts/UIModels/AppState/ContentListViewState.ts
@@ -379,15 +379,18 @@ export class ContentListViewState extends AbstractState {
 
   createNewNote = async () => {
     this.appState.notes.unselectNotes()
+    this.appState.tags.selected = this.appState.tags.smartViews.find((view) => view.uuid === SystemViewId.AllNotes)
 
-    let title = `Note ${this.notes.length + 1}`
-    if (this.isFiltering) {
-      title = this.noteFilterText
-    }
+    setTimeout(async () => {
+      let title = `Note ${this.notes.length + 1}`
+      if (this.isFiltering) {
+        title = this.noteFilterText
+      }
 
-    await this.appState.notes.createNewNoteController(title)
+      await this.appState.notes.createNewNoteController(title)
 
-    this.appState.noteTags.reloadTags()
+      this.appState.noteTags.reloadTags()
+    })
   }
 
   createPlaceholderNote = () => {