diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 05dc9e001..0fd9098f9 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -145,7 +145,9 @@ export class AppComponent {
   }
 
   navigateToRiskAssessment(): void {
-    this.route.navigate([Routes.RiskAssessment]);
+    this.route.navigate([Routes.RiskAssessment]).then(() => {
+      this.appStore.setFocusOnPage();
+    });
   }
 
   async closeCertificates(): Promise<void> {