diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 1255ae67c75..bd36b98d957 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -277,6 +277,8 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
           const discarded = activeNote.deleted || activeNote.trashed;
           if (discarded && !this.appState?.selectedTag?.isTrashTag) {
             this.selectNextOrCreateNew();
+          } else {
+            this.selectNote(activeNote);
           }
         } else {
           this.selectFirstNote();