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 297fa23c56..d7c24c7601 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
@@ -206,8 +206,7 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal {
     fromEvent(window, 'beforeunload')
       .pipe(takeUntil(this.destroy$))
       .subscribe(event => {
-        // TODO: check this
-        if (!this.isFormDirty || this.suppressUnsavedChangesWarning) {
+        if (this.isFormDirty && !this.suppressUnsavedChangesWarning) {
           event.preventDefault();
         }
       });