diff --git a/app/assets/javascripts/views/editor/editor-view.pug b/app/assets/javascripts/views/editor/editor-view.pug
index 1251d36c0..89c94e83a 100644
--- a/app/assets/javascripts/views/editor/editor-view.pug
+++ b/app/assets/javascripts/views/editor/editor-view.pug
@@ -32,7 +32,7 @@
         ) {{self.state.noteStatus.message}}
       .desc(ng-show='self.state.noteStatus.desc') {{self.state.noteStatus.desc}}
     .editor-tags
-      #note-tags-component-container(ng-if='self.state.tagsComponent')
+      #note-tags-component-container(ng-if='self.state.tagsComponent && !self.note.errorDecrypting')
         component-view.component-view(
           component-uuid='self.state.tagsComponent.uuid',
           ng-class="{'locked' : self.noteLocked}",
@@ -244,7 +244,7 @@
             p.sk-p(ng-if='!self.note.waitingForKey')
               | There was an error decrypting this item. Ensure you are running the
               | latest version of this app, then sign out and sign back in to try again.
-  #editor-pane-component-stack(ng-show='self.note')
+  #editor-pane-component-stack(ng-if='!self.note.errorDecrypting' ng-show='self.note')
     #component-stack-menu-bar.sk-app-bar.no-edges(ng-if='self.state.stackComponents.length')
       .left
         .sk-app-bar-item(
diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts
index f0f0ee0f6..7cabd1323 100644
--- a/app/assets/javascripts/views/editor/editor_view.ts
+++ b/app/assets/javascripts/views/editor/editor_view.ts
@@ -290,6 +290,7 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
     this.reloadTagsString();
     this.reloadPreferences();
     this.reloadStackComponents();
+    this.reloadNoteTagsComponent();
     if (note.safeText().length === 0) {
       this.focusTitle();
     }
@@ -1080,7 +1081,6 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
     this.application.componentManager!.contextItemDidChangeInArea(ComponentArea.EditorStack);
   }
 
-
   stackComponentHidden(component: SNComponent) {
     return this.application.componentManager?.isComponentHidden(component);
   }
diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 8b193021d..6f30bce54 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -73,7 +73,7 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
   private removeObservers: Array<() => void> = [];
 
   /* @ngInject */
-  constructor($timeout: ng.ITimeoutService, ) {
+  constructor($timeout: ng.ITimeoutService,) {
     super($timeout);
     this.resetPagination();
   }
@@ -259,6 +259,9 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
 
   async selectNote(note: SNNote) {
     await this.appState.openEditor(note.uuid);
+    if (note.waitingForKey) {
+      this.application.presentKeyRecoveryWizard();
+    }
     this.reloadNotes();
   }