diff --git a/libs/ui/src/lib/activities-filter/activities-filter.component.html b/libs/ui/src/lib/activities-filter/activities-filter.component.html
index d87ce16ce..b525e5133 100644
--- a/libs/ui/src/lib/activities-filter/activities-filter.component.html
+++ b/libs/ui/src/lib/activities-filter/activities-filter.component.html
@@ -1,7 +1,5 @@
 <mat-form-field appearance="outline" class="w-100">
-  <button disabled mat-icon-button matPrefix>
-    <ion-icon name="search-outline" />
-  </button>
+  <ion-icon class="mat-icon" matPrefix name="search-outline" />
   <mat-chip-grid #chipList aria-label="Search keywords">
     @for (filter of selectedFilters; track filter) {
       <mat-chip-row
@@ -42,12 +40,7 @@
     }
   </mat-autocomplete>
 
-  <button
-    disabled
-    mat-icon-button
-    matSuffix
-    [ngClass]="{ 'd-none': !isLoading() }"
-  >
-    <mat-spinner matSuffix [diameter]="20" />
-  </button>
+  @if (isLoading()) {
+    <mat-spinner class="mx-2" matSuffix [diameter]="20" />
+  }
 </mat-form-field>