diff --git a/src/main/angular/src/app/app.html b/src/main/angular/src/app/app.html
index a79f044..a0593e0 100644
--- a/src/main/angular/src/app/app.html
+++ b/src/main/angular/src/app/app.html
@@ -26,7 +26,9 @@
 
 <div class="MainMenuDrawer NoUserSelect" [hidden]="!showDrawer">
   @for (location of locationList; track location.id) {
-    <div class="MainMenuItem" (click)="navigate(`Location/${location.id}`); showDrawer = false" routerLinkActive="MainMenuItemActive">{{ location.name }}</div>
+    @if (location.id !== locationService.id) {
+      <div class="MainMenuItem" (click)="navigate(`Location/${location.id}`); showDrawer = false" routerLinkActive="MainMenuItemActive">{{ location.name }}</div>
+    }
   }
 </div>
 
diff --git a/src/main/angular/src/app/location/detail/location-detail.ts b/src/main/angular/src/app/location/detail/location-detail.ts
index 923c958..536a337 100644
--- a/src/main/angular/src/app/location/detail/location-detail.ts
+++ b/src/main/angular/src/app/location/detail/location-detail.ts
@@ -79,14 +79,13 @@ export class LocationDetail implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.locationService.id = null;
     this.subs.push(this.activatedRoute.params.subscribe(params => {
       const id = paramNumberOrNull(params, "id");
       if (id === null && this.configService.locationId !== null) {
         this.router.navigate(["Location/" + this.configService.locationId]);
         return;
       }
-      this.locationService.id = id;
+      setTimeout(() => this.locationService.id = id, 0);
     }));
     this.subs.push(this.locationService.location$.subscribe(this.onLocationChange));
   }
diff --git a/src/main/angular/src/app/menu-service.ts b/src/main/angular/src/app/menu-service.ts
index 7b59bda..1107f68 100644
--- a/src/main/angular/src/app/menu-service.ts
+++ b/src/main/angular/src/app/menu-service.ts
@@ -5,6 +5,14 @@ import {Injectable} from '@angular/core';
 })
 export class MenuService {
 
-  title: string = "";
+  private _title: string = "";
+
+  get title(): string {
+    return this._title;
+  }
+
+  set title(value: string) {
+    setTimeout(() => this._title = value, 0);
+  }
 
 }