Fixes #336, fixes #328

app/assets/javascripts/app/controllers/notes.js

@@ -338,6 +338,7 @@ export class NotesPanel {
         if(this.selectedNote.dummy && oldTag) {
           _.remove(oldTag.notes, this.selectedNote);
         }
+        this.selectNote(null);
       }
 
       this.noteFilter.text = "";
@@ -351,7 +352,7 @@ export class NotesPanel {
           this.notes.forEach((note) => { note.visible = true; })
           this.selectFirstNote();
         } else if(syncManager.initialDataLoaded()) {
-          if(!tag.isSmartTag()) {
+          if(!tag.isSmartTag() || tag.content.isAllTag) {
             this.createNewNote();
           } else {
             if(this.selectedNote && !this.notes.includes(this.selectedNote)) {
@@ -400,6 +401,7 @@ export class NotesPanel {
       }
 
       if(!note) {
+        this.selectedNote = null;
         this.selectionMade()(null);
         return;
       }

app/assets/javascripts/app/controllers/tags.js

@@ -32,17 +32,36 @@ export class TagsPanel {
     })
 
     syncManager.addEventHandler((syncEvent, data) => {
-      if(syncEvent == "local-data-loaded"
-        || syncEvent == "sync:completed"
-        || syncEvent == "local-data-incremental-load") {
+      if(syncEvent == 'local-data-loaded'
+        || syncEvent == 'sync:completed'
+        || syncEvent == 'local-data-incremental-load') {
         this.tags = modelManager.tags;
         this.smartTags = modelManager.getSmartTags();
       }
     });
 
-    modelManager.addItemSyncObserver("tags-list", "*", (allItems, validItems, deletedItems, source, sourceKey) => {
-      this.reloadNoteCounts();
-    });
+    modelManager.addItemSyncObserver(
+      'tags-list',
+      '*',
+      (allItems, validItems, deletedItems, source, sourceKey) => {
+        this.reloadNoteCounts();
+      }
+    );
+
+    modelManager.addItemSyncObserver(
+      'tags-list-tags',
+      'Tag',
+      (allItems, validItems, deletedItems, source, sourceKey) => {
+        if(!this.selectedTag) {
+          return;
+        }
+        /** If the selected tag has been deleted, revert to All view. */
+        const selectedTag = allItems.find((tag) => tag.uuid === this.selectedTag.uuid);
+        if(selectedTag && selectedTag.deleted) {
+          this.selectTag(this.smartTags[0]);
+        }
+      }
+    );
 
     this.reloadNoteCounts = function() {
       let allTags = [];