diff --git a/src/lib/buttons/icon-button/icon-button.component.html b/src/lib/buttons/icon-button/icon-button.component.html
index 703af59..d086836 100644
--- a/src/lib/buttons/icon-button/icon-button.component.html
+++ b/src/lib/buttons/icon-button/icon-button.component.html
@@ -1,5 +1,5 @@
 <button
-    (click)="!disabled() && action.emit($event)"
+    (click)="!disabled() && emitAction($event)"
     [disabled]="disabled()"
     [id]="buttonId()"
     [iqserStopPropagation]="action.observed && !_hasRouterLink"
diff --git a/src/lib/buttons/icon-button/icon-button.component.ts b/src/lib/buttons/icon-button/icon-button.component.ts
index 6047175..2dcb930 100644
--- a/src/lib/buttons/icon-button/icon-button.component.ts
+++ b/src/lib/buttons/icon-button/icon-button.component.ts
@@ -1,15 +1,5 @@
 import { NgClass } from '@angular/common';
-import {
-    booleanAttribute,
-    ChangeDetectionStrategy,
-    Component,
-    computed,
-    EventEmitter,
-    HostListener,
-    inject,
-    input,
-    Output,
-} from '@angular/core';
+import { booleanAttribute, ChangeDetectionStrategy, Component, computed, EventEmitter, inject, input, Output } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { RouterLink } from '@angular/router';
@@ -44,9 +34,10 @@ export class IconButtonComponent {
     });
     @Output() readonly action = new EventEmitter<MouseEvent>();
 
-    @HostListener('window:keydown.Enter', ['$event'])
-    preventEnterKey($event: KeyboardEvent) {
-        $event?.preventDefault();
-        $event?.stopPropagation();
+    emitAction($event: MouseEvent) {
+        const activeElement = document.activeElement as HTMLElement;
+        if (activeElement.tagName?.toLowerCase() === 'button') {
+            this.action.emit($event);
+        }
     }
 }