diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
index 4c4c8f4b9..f61d525b3 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
@@ -29,6 +29,7 @@ import { MatSidenavModule } from '@angular/material/sidenav';
 import {
   COPY_PROFILE_MOCK,
   NEW_PROFILE_MOCK,
+  NEW_PROFILE_MOCK_DRAFT,
   PROFILE_MOCK,
 } from '../../mocks/profile.mock';
 import { of } from 'rxjs';
@@ -247,7 +248,7 @@ describe('RiskAssessmentComponent', () => {
       });
 
       describe('with profile selected', () => {
-        it('should open save profile modal', fakeAsync(() => {
+        it('should open save profile modal for valid profile', fakeAsync(() => {
           const openSpy = spyOn(component.dialog, 'open').and.returnValue({
             afterClosed: () => of(true),
           } as MatDialogRef<typeof SimpleDialogComponent>);
@@ -255,9 +256,31 @@ describe('RiskAssessmentComponent', () => {
           component.saveProfileClicked(NEW_PROFILE_MOCK, PROFILE_MOCK);
 
           expect(openSpy).toHaveBeenCalledWith(SimpleDialogComponent, {
-            ariaLabel: 'Save changes',
+            ariaLabel: 'Save profile',
             data: {
-              title: 'Save changes',
+              title: 'Save profile',
+              content: `You are about to save changes in Primary profile. Are you sure?`,
+            },
+            autoFocus: true,
+            hasBackdrop: true,
+            disableClose: true,
+            panelClass: 'simple-dialog',
+          });
+
+          openSpy.calls.reset();
+        }));
+
+        it('should open save draft profile modal', fakeAsync(() => {
+          const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+            afterClosed: () => of(true),
+          } as MatDialogRef<typeof SimpleDialogComponent>);
+
+          component.saveProfileClicked(NEW_PROFILE_MOCK_DRAFT, PROFILE_MOCK);
+
+          expect(openSpy).toHaveBeenCalledWith(SimpleDialogComponent, {
+            ariaLabel: 'Save draft profile',
+            data: {
+              title: 'Save draft profile',
               content: `You are about to save changes in Primary profile. Are you sure?`,
             },
             autoFocus: true,
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 ced7e9aa5..2f72b9ddb 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
@@ -24,7 +24,7 @@ import { SimpleDialogComponent } from '../../components/simple-dialog/simple-dia
 import { Subject, takeUntil } from 'rxjs';
 import { MatDialog } from '@angular/material/dialog';
 import { LiveAnnouncer } from '@angular/cdk/a11y';
-import { Profile } from '../../model/profile';
+import { Profile, ProfileStatus } from '../../model/profile';
 import { Observable } from 'rxjs/internal/Observable';
 import { DeviceValidators } from '../devices/components/device-form/device.validators';
 
@@ -116,7 +116,10 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
       this.saveProfile(profile);
       this.store.setFocusOnCreateButton();
     } else {
-      this.openSaveDialog(selectedProfile.name)
+      this.openSaveDialog(
+        selectedProfile.name,
+        profile.status === ProfileStatus.DRAFT
+      )
         .pipe(takeUntil(this.destroy$))
         .subscribe(saveProfile => {
           if (saveProfile) {
@@ -160,11 +163,14 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     this.store.setFocus({ nextItem, firstItem });
   }
 
-  private openSaveDialog(profileName: string): Observable<boolean> {
+  private openSaveDialog(
+    profileName: string,
+    draft: boolean = false
+  ): Observable<boolean> {
     const dialogRef = this.dialog.open(SimpleDialogComponent, {
-      ariaLabel: 'Save changes',
+      ariaLabel: `Save ${draft ? 'draft profile' : 'profile'}`,
       data: {
-        title: 'Save changes',
+        title: `Save ${draft ? 'draft profile' : 'profile'}`,
         content: `You are about to save changes in ${profileName}. Are you sure?`,
       },
       autoFocus: true,