diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 42340d9a97e..5a8911252a0 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -328,7 +328,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
    * an index is roughly O(n^2).
    */
   private reloadNotesDisplayOptions() {
-    const tag = this.appState.selectedTag!;
+    const tag = this.appState.selectedTag;
     const searchText = this.getState().noteFilter.text.toLowerCase();
     const searchQuery = searchText ? {
       query: searchText,
@@ -337,7 +337,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
     const criteria = NotesDisplayCriteria.Create({
       sortProperty: this.state.sortBy! as CollectionSort,
       sortDirection: this.state.sortReverse! ? 'asc' : 'dsc',
-      tags: [tag],
+      tags: tag ? [tag] : [],
       includeArchived: this.getState().showArchived!,
       includePinned: !this.getState().hidePinned!,
       searchQuery: searchQuery
diff --git a/app/assets/javascripts/views/tags/tags_view.ts b/app/assets/javascripts/views/tags/tags_view.ts
index 60add087a96..d7ce1bbc81b 100644
--- a/app/assets/javascripts/views/tags/tags_view.ts
+++ b/app/assets/javascripts/views/tags/tags_view.ts
@@ -246,12 +246,8 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
               this.selectTag(tag as SNTag);
             }
           } else if (data.item!.content_type === ContentType.SmartTag) {
-            this.application.createTemplateItem(
-              ContentType.SmartTag,
-              data.item!.content as PayloadContent
-            ).then(smartTag => {
-              this.selectTag(smartTag as SNSmartTag);
-            });
+            const matchingTag = this.getState().smartTags.find(t => t.uuid === data.item!.uuid);
+            this.selectTag(matchingTag as SNSmartTag);
           }
         } else if (action === ComponentAction.ClearSelection) {
           this.selectTag(this.getState().smartTags[0]);