diff --git a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
index 4d6a70ce1..db32e5339 100644
--- a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
+++ b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
@@ -206,6 +206,11 @@ 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)
+      }
     })
   }