diff --git a/src/lib/dialog/base-dialog.component.ts b/src/lib/dialog/base-dialog.component.ts
index 33b8f4a..bfa554d 100644
--- a/src/lib/dialog/base-dialog.component.ts
+++ b/src/lib/dialog/base-dialog.component.ts
@@ -6,6 +6,8 @@ import { ConfirmOptions } from '../misc';
 import { ConfirmationDialogService } from './confirmation-dialog.service';
 import { firstValueFrom } from 'rxjs';
 
+const TARGET_NODE = 'mat-dialog-container';
+
 export interface SaveOptions {
     closeAfterSave?: boolean;
     addMembers?: boolean;
@@ -75,8 +77,8 @@ export abstract class BaseDialogComponent extends AutoUnsubscribe implements OnI
     @HostListener('window:keydown.Enter', ['$event'])
     onEnter(event: KeyboardEvent): void {
         event?.stopImmediatePropagation();
-        const node = (event.target as IqserEventTarget).localName;
-        if (this.valid && !this.disabled && this.changed && node !== 'textarea') {
+        const node = (event.target as IqserEventTarget).localName?.trim()?.toLowerCase();
+        if (this.valid && !this.disabled && this.changed && node === TARGET_NODE) {
             this.save();
         }
     }