diff --git a/src/app/gui/navbar/navbar.component.html b/src/app/gui/navbar/navbar.component.html
index c97fd64..693aa7e 100644
--- a/src/app/gui/navbar/navbar.component.html
+++ b/src/app/gui/navbar/navbar.component.html
@@ -7,14 +7,14 @@
 						[href]="link.address"
 						[target]="link.newtab === undefined || link.newtab === true ? '_blank' : '_self'"
 						rel="noopener"
-						[class.forcefocus] = "(currentDocument.onDocumentChange() | async)?.id == link.address"
+						[class.forcefocus] = "currentDocument?.id == link.address"
 					><span>{{link.text}}</span></a>
 					<a
 						*ngIf="link.external !== true"
 						[routerLink]="link.address"
 						[target]="link.newtab === true ? '_blank' : '_self'"
 						rel="noopener"
-						[class.force-focus] = "'/page/' + (currentDocument.onDocumentChange() | async)?.id == link.address"
+						[class.force-focus] = "'/page/' + currentDocument?.id == link.address || (currentDocument?.id == 'index' && link.address == '/')"
 					><span>{{link.text}}</span></a>
 			</li>
 		</ul>
diff --git a/src/app/gui/navbar/navbar.component.ts b/src/app/gui/navbar/navbar.component.ts
index 66f71eb..bc12ec3 100644
--- a/src/app/gui/navbar/navbar.component.ts
+++ b/src/app/gui/navbar/navbar.component.ts
@@ -4,6 +4,8 @@ import { ActivatedRoute, UrlSegment } from "@angular/router";
 import { map } from "rxjs/operators";
 import { CurrentDocumentService } from "src/app/services/current-document.service";
 import { navigationLinks } from "src/app/app-routing.module";
+import { DocumentData } from "src/app/symbols/DocumentData";
+import { Observable } from "rxjs";
 
 @Component({
 	selector: "app-navbar",
@@ -18,8 +20,13 @@ export class NavbarComponent implements OnInit, AfterViewInit {
 	overflowMax = false;
 	@ViewChild("navlogo") navLogo: ElementRef<HTMLElement>;
 	@ViewChild("navbuttons") navButtons: ElementRef<HTMLElement>;
+	currentDocument: DocumentData;
 
-	constructor(private elRef: ElementRef<HTMLElement>, public currentDocument: CurrentDocumentService) { }
+	constructor(private elRef: ElementRef<HTMLElement>, currentDocument: CurrentDocumentService) {
+		currentDocument.onDocumentChange().subscribe(docData => {
+			this.currentDocument = docData;
+		});
+	}
 
 	ngOnInit() {
 	}