diff --git a/src/components/ha-icon-button.ts b/src/components/ha-icon-button.ts
index 311e4fb368..1c645b50cd 100644
--- a/src/components/ha-icon-button.ts
+++ b/src/components/ha-icon-button.ts
@@ -24,28 +24,21 @@ export class HaIconButton extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <mwc-icon-button
-        .label=${this.label}
-        ?disabled=${this.disabled}
-        @click=${this._handleClick}
-      >
+      <mwc-icon-button .label=${this.label} .disabled=${this.disabled}>
         <ha-icon .icon=${this.icon}></ha-icon>
       </mwc-icon-button>
     `;
   }
 
-  private _handleClick(ev) {
-    if (this.disabled) {
-      ev.stopPropagation();
-    }
-  }
-
   static get styles(): CSSResult {
     return css`
       :host {
         display: inline-block;
         outline: none;
       }
+      :host([disabled]) {
+        pointer-events: none;
+      }
       mwc-icon-button {
         --mdc-theme-on-primary: currentColor;
         --mdc-theme-text-disabled-on-light: var(--disabled-text-color);