diff --git a/app/assets/javascripts/views/tags/tags_view.ts b/app/assets/javascripts/views/tags/tags_view.ts
index 4bd6f721d..cd19ff1f0 100644
--- a/app/assets/javascripts/views/tags/tags_view.ts
+++ b/app/assets/javascripts/views/tags/tags_view.ts
@@ -202,7 +202,7 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
 
   registerComponentHandler() {
     this.unregisterComponent =
-      this.application.componentManager!.registerHandler({
+      this.application.componentManager.registerHandler({
         identifier: 'tags',
         areas: [ComponentArea.TagsList],
         actionHandler: (_, action, data) => {
@@ -213,7 +213,13 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
               return;
             }
 
-            if (item.content_type === ContentType.SmartTag) {
+            if (item.content_type === ContentType.Tag) {
+              const matchingTag =  this.application.findItem(item.uuid);
+
+              if (matchingTag) {
+                this.selectTag(matchingTag as SNTag);
+              }
+            } else if (item.content_type === ContentType.SmartTag) {
               const matchingTag = this.getState().smartTags.find(
                 (t) => t.uuid === item.uuid
               );
diff --git a/package.json b/package.json
index 464e0e9a3..59d6228cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.9.6",
+  "version": "3.9.7",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",