diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 0b386ce8d..fe53f12c4 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -167,6 +167,7 @@ <h1 class="main-heading">Testrun</h1>
     mat-button
     routerLink="{{ route }}"
     routerLinkActive="app-sidebar-button-active"
+    (keydown.space)="onNavigationClick()"
     (keydown.enter)="onNavigationClick()">
     <mat-icon *ngIf="svgIcon" svgIcon="{{ svgIcon }}"></mat-icon>
     <mat-icon *ngIf="icon" class="material-symbols-outlined">{{
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 309940424..2f1799022 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -326,7 +326,8 @@ export class AppComponent implements AfterViewInit {
         take(1)
       )
       .subscribe(() => {
-        this.appStore.setFocusOnPage(null);
+        const mainContainer = window.document.querySelector('#main');
+        this.appStore.setFocusOnPage(mainContainer);
       });
   }