diff --git a/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.html b/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.html
index 720d8cf57..d1e316494 100644
--- a/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.html
+++ b/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.html
@@ -1,14 +1,16 @@
-<app-modal-content title="Filter by labels" [subtitle]="selectedCount + ' selected'" confirmButtonText="Filter"
+<app-modal-content title="Filter by labels" [subtitle]="selectedCount + ' labels selected'" confirmButtonText="Filter"
     (confirm)="handleConfirmSelections()">
     <div *ngIf="selectedCount < totalLabelCount; else allLabelsSelected">
         <div class="mb-4">
             <input type="text" class="form-control" placeholder="Search tags to filter by..." [(ngModel)]="searchText">
         </div>
         <ul class="d-flex flex-wrap align-items-center mb-0">
-            <li *ngFor="let entry of labels | keyvalue | filter:'value':false" class="mr-2 mb-2">
-                <app-colored-text-chip [text]="entry.key" [isClickable]="true" (click)="handleLabelSelection(entry.key)"
-                    colorMode="dim"></app-colored-text-chip>
-            </li>
+            <ng-container *ngFor="let entry of labels | keyvalue | filter:'value':false">
+                <li *ngIf="!searchText || entry.key.indexOf(searchText) >= 0">
+                    <app-colored-text-chip [text]="entry.key" [isClickable]="true"
+                        (click)="handleLabelSelection(entry.key)" colorMode="dim"></app-colored-text-chip>
+                </li>
+            </ng-container>
         </ul>
     </div>
     <hr />
diff --git a/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.scss b/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.scss
index f859b3577..e69de29bb 100644
--- a/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.scss
+++ b/projects/gameboard-ui/src/app/support/components/ticket-label-picker-modal/ticket-label-picker-modal.component.scss
@@ -1,3 +0,0 @@
-li {
-  //   flex-basis: 30%;
-}