diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 743c859c5..81aaae2d9 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -273,15 +273,17 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
          * we dont need to reload display options */
         await this.reloadNotes();
         const activeNote = this.activeEditorNote;
-        if (activeNote) {
-          const discarded = activeNote.deleted || activeNote.trashed;
-          if (discarded && !this.appState?.selectedTag?.isTrashTag) {
-            this.selectNextOrCreateNew();
+        if (this.application.getAppState().notes.selectedNotesCount < 2) {
+          if (activeNote) {
+            const discarded = activeNote.deleted || activeNote.trashed;
+            if (discarded && !this.appState?.selectedTag?.isTrashTag) {
+              this.selectNextOrCreateNew();
+            } else {
+              this.selectNote(activeNote);
+            }
           } else {
-            this.selectNote(activeNote);
+            this.selectFirstNote();
           }
-        } else {
-          this.selectFirstNote();
         }
       }
     ));