diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index e6dabdc8d..d9e58d7f2 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 2.3.2
+Version: 2.3.1-beta.1
 Architecture: amd64
 Maintainer: Google <ssm-orcas@google.com>
 Homepage: https://github.com/google/testrun
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 1e4a46666..08bd3476d 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
@@ -206,8 +206,8 @@ export class RiskAssessmentComponent
     this.liveAnnouncer.clear();
     if (!selectedProfile) {
       this.saveProfile(profile, () => {
-        this.store.setFocusOnCreateButton();
         this.store.scrollToSelectedProfile();
+        this.store.setFocusOnSelectedProfile();
       });
     } else if (
       this.compareProfiles(profile, selectedProfile) ||
@@ -379,10 +379,13 @@ export class RiskAssessmentComponent
       onSave: (profile: Profile) => {
         if (profile.status === ProfileStatus.VALID) {
           this.openSuccessDialog(profile, focusElement);
-        } else {
-          focusElement();
         }
         this.store.updateSelectedProfile(profile);
+        if (profile.status !== ProfileStatus.VALID) {
+          timer(100).subscribe(() => {
+            focusElement();
+          });
+        }
       },
     });
   }