diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index 574982445..1336a67de 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -59,7 +59,8 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     this.isOpenProfileForm = true;
     this.store.updateSelectedProfile(profile);
     await this.liveAnnouncer.announce('Risk assessment questionnaire');
-    this.focusManagerService.focusFirstElementInContainer();
+    const profileForm = window.document.querySelector('app-profile-form');
+    this.focusManagerService.focusFirstElementInContainer(profileForm);
   }
 
   deleteProfile(