diff --git a/src/lib/buttons/circle-button/circle-button.component.html b/src/lib/buttons/circle-button/circle-button.component.html
index db64330..de0dc40 100644
--- a/src/lib/buttons/circle-button/circle-button.component.html
+++ b/src/lib/buttons/circle-button/circle-button.component.html
@@ -1,15 +1,20 @@
-<div [matTooltipClass]="tooltipClass" [matTooltipPosition]="tooltipPosition" [matTooltip]="tooltip">
+<div
+    (click)="preventActionOnDisabled($event)"
+    [matTooltipClass]="tooltipClass"
+    [matTooltipPosition]="tooltipPosition"
+    [matTooltip]="tooltip"
+>
     <button
         (click)="performAction($event)"
         [class.dark-bg]="type === circleButtonTypes.dark"
+        [class.grey-selected]="greySelected"
+        [class.help]="type === circleButtonTypes.help"
         [class.overlay]="showDot"
         [class.primary]="type === circleButtonTypes.primary"
         [class.warn]="type === circleButtonTypes.warn"
-        [class.help]="type === circleButtonTypes.help"
-        [class.grey-selected]="greySelected"
         [disabled]="disabled"
-        [type]="isSubmit ? 'submit' : 'button'"
         [id]="id ? id : buttonId"
+        [type]="isSubmit ? 'submit' : 'button'"
         mat-icon-button
     >
         <mat-icon [svgIcon]="icon"></mat-icon>
diff --git a/src/lib/buttons/circle-button/circle-button.component.ts b/src/lib/buttons/circle-button/circle-button.component.ts
index a9230b4..1fdb07d 100644
--- a/src/lib/buttons/circle-button/circle-button.component.ts
+++ b/src/lib/buttons/circle-button/circle-button.component.ts
@@ -42,10 +42,6 @@ export class CircleButtonComponent implements OnInit {
     }
 
     performAction($event: MouseEvent): void {
-        if (this.disabled) {
-            return;
-        }
-
         if (this.removeTooltip) {
             this._matTooltip.hide();
             // Timeout to allow tooltip to disappear first,
@@ -55,4 +51,10 @@ export class CircleButtonComponent implements OnInit {
             this.action.emit($event);
         }
     }
+
+    preventActionOnDisabled($event: MouseEvent): void {
+        if (this.disabled) {
+            $event.stopPropagation();
+        }
+    }
 }