diff --git a/src/lib/buttons/chevron-button/chevron-button.component.html b/src/lib/buttons/chevron-button/chevron-button.component.html
index efea7c1..cc05f08 100644
--- a/src/lib/buttons/chevron-button/chevron-button.component.html
+++ b/src/lib/buttons/chevron-button/chevron-button.component.html
@@ -1,4 +1,4 @@
-<button [class.overlay]="showDot" [class.primary]="primary" mat-button>
+<button [class.overlay]="showDot" [class.primary]="primary" [disabled]="disabled" mat-button>
     <span>{{ label }}</span>
     <mat-icon class="chevron-icon" svgIcon="iqser:arrow-down"></mat-icon>
 </button>
diff --git a/src/lib/buttons/chevron-button/chevron-button.component.ts b/src/lib/buttons/chevron-button/chevron-button.component.ts
index fc9936d..cd8cbbc 100644
--- a/src/lib/buttons/chevron-button/chevron-button.component.ts
+++ b/src/lib/buttons/chevron-button/chevron-button.component.ts
@@ -11,4 +11,5 @@ export class ChevronButtonComponent {
     @Input() @Required() label!: string;
     @Input() showDot = false;
     @Input() primary = false;
+    @Input() disabled = false;
 }
diff --git a/src/lib/buttons/icon-button/icon-button.component.scss b/src/lib/buttons/icon-button/icon-button.component.scss
index 056d65d..723c46e 100644
--- a/src/lib/buttons/icon-button/icon-button.component.scss
+++ b/src/lib/buttons/icon-button/icon-button.component.scss
@@ -14,6 +14,13 @@ button {
         }
     }
 
+    &.mat-button-disabled {
+        cursor: not-allowed;
+        ::ng-deep .mat-button-wrapper {
+            opacity: 1;
+        }
+    }
+
     mat-icon {
         width: 14px;
     }
diff --git a/src/lib/filtering/popup-filter/popup-filter.component.html b/src/lib/filtering/popup-filter/popup-filter.component.html
index 62d2199..404682c 100644
--- a/src/lib/filtering/popup-filter/popup-filter.component.html
+++ b/src/lib/filtering/popup-filter/popup-filter.component.html
@@ -1,20 +1,39 @@
 <ng-container *ngIf="primaryFilterGroup$ | async as primaryGroup">
-    <iqser-icon-button
-        *ngIf="primaryGroup.icon"
-        [attr.aria-expanded]="expanded$ | async"
-        [icon]="primaryGroup.icon"
-        [label]="primaryGroup.label || ('filter-menu.label' | translate)"
-        [matMenuTriggerFor]="filterMenu"
-        [showDot]="hasActiveFilters$ | async"
-    ></iqser-icon-button>
+    <ng-container *ngIf="primaryGroup.icon" [ngSwitch]="(primaryFilters$ | async)?.length > 0">
+        <iqser-icon-button
+            *ngSwitchCase="false"
+            [icon]="primaryGroup.icon"
+            [label]="primaryGroup.label || ('filter-menu.label' | translate)"
+            [disabled]="true"
+        ></iqser-icon-button>
 
-    <iqser-chevron-button
-        *ngIf="!primaryGroup.icon"
-        [attr.aria-expanded]="expanded$ | async"
-        [label]="primaryGroup.label || ('filter-menu.label' | translate)"
-        [matMenuTriggerFor]="filterMenu"
-        [showDot]="hasActiveFilters$ | async"
-    ></iqser-chevron-button>
+        <iqser-icon-button
+            *ngSwitchCase="true"
+            [attr.aria-expanded]="expanded$ | async"
+            [icon]="primaryGroup.icon"
+            [label]="primaryGroup.label || ('filter-menu.label' | translate)"
+            [matMenuTriggerFor]="filterMenu"
+            [showDot]="hasActiveFilters$ | async"
+        ></iqser-icon-button>
+    </ng-container>
+
+    <ng-container *ngIf="!primaryGroup.icon" [ngSwitch]="(primaryFilters$ | async)?.length > 0">
+        <iqser-chevron-button
+            *ngSwitchCase="false"
+            [attr.aria-expanded]="expanded$ | async"
+            [label]="primaryGroup.label || ('filter-menu.label' | translate)"
+            [showDot]="hasActiveFilters$ | async"
+            [disabled]="true"
+        ></iqser-chevron-button>
+
+        <iqser-chevron-button
+            *ngSwitchCase="true"
+            [attr.aria-expanded]="expanded$ | async"
+            [label]="primaryGroup.label || ('filter-menu.label' | translate)"
+            [matMenuTriggerFor]="filterMenu"
+            [showDot]="hasActiveFilters$ | async"
+        ></iqser-chevron-button>
+    </ng-container>
 
     <mat-menu
         #filterMenu="matMenu"