diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
index c5829c8e79..d1414d0272 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -193,10 +193,10 @@ export class ModalComponent implements OnDestroy {
     fromEvent(window, 'beforeunload')
       .pipe(takeUntil(this.destroy$))
       .subscribe(event => {
-        if (this.isFormDirty) {
+        event.preventDefault();
+        if (this.isFormDirty && !this.suppressUnsavedChangesWarning) {
           event.returnValue = true;
         } else {
-          event.returnValue = false;
           delete event.returnValue;
         }
       });