diff --git a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
index db32e5339..6febb4606 100644
--- a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
+++ b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
@@ -206,17 +206,17 @@ export class NavigationController
       this.tags = this.items.getDisplayableTags()
       this.starredTags = this.tags.filter((tag) => tag.starred)
       this.smartViews = this.items.getSmartViews()
-      if (this.selectedUuid) {
-        this.findAndSetTag(this.selectedUuid)
-      } else {
-        this.selectHomeNavigationView().catch(console.error)
-      }
     })
   }
 
   async handleEvent(event: InternalEventInterface): Promise<void> {
     if (event.type === VaultDisplayServiceEvent.VaultDisplayOptionsChanged) {
       this.reloadTags()
+      if (this.selectedUuid) {
+        this.findAndSetTag(this.selectedUuid)
+      } else {
+        this.selectHomeNavigationView().catch(console.error)
+      }
     }
   }