diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index f20d50012..754677ce7 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -232,7 +232,7 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
         const activeNote = this.activeEditorNote;
         if (activeNote) {
           const discarded = activeNote.deleted || activeNote.trashed;
-          if (discarded) {
+          if (discarded && !this.appState?.selectedTag?.isTrashTag) {
             this.selectNextOrCreateNew();
           }
         } else {