diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts
index c6e891a2e9..97d6b14fb9 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal-close.directive.ts
@@ -13,9 +13,4 @@ export class ModalCloseDirective {
   onClick() {
     this.modal?.close();
   }
-
-  @HostListener('document:keydown.escape') 
-  handleKeyboardEvent(event: KeyboardEvent) {
-    this.modal?.close();
-  }
 }
\ No newline at end of file
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 ebb0515a08..297fa23c56 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
@@ -51,7 +51,9 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal {
     this._busy = value;
   }
 
-  @Input() options: NgbModalOptions = {};
+  @Input() options: NgbModalOptions = {
+    keyboard: true,
+  };
 
   @Input() suppressUnsavedChangesWarning = this.suppressUnsavedChangesWarningToken;