diff --git a/demo-shell/src/app/components/search/search-result.component.html b/demo-shell/src/app/components/search/search-result.component.html
index a115dc9262..4a97f107cd 100644
--- a/demo-shell/src/app/components/search/search-result.component.html
+++ b/demo-shell/src/app/components/search/search-result.component.html
@@ -3,7 +3,7 @@
 </div>
 
 <div class="adf-search-results">
-    <adf-search-filter #searchFilter></adf-search-filter>
+    <adf-search-filter class="adf-search-settings" #searchFilter></adf-search-filter>
 
     <div class="adf-search-results__content">
         <mat-progress-bar *ngIf="isLoading" color="primary" mode="indeterminate"></mat-progress-bar>
diff --git a/e2e/pages/adf/content_services/search/components/search-checkList.ts b/e2e/pages/adf/content_services/search/components/search-checkList.ts
index 8aa56ba39d..b286c81b16 100644
--- a/e2e/pages/adf/content_services/search/components/search-checkList.ts
+++ b/e2e/pages/adf/content_services/search/components/search-checkList.ts
@@ -119,7 +119,7 @@ export class SearchCheckListPage {
         let bucketNumber = fileTypeFilter.getText().then((valueOfBucket) => {
             let numberOfBucket = valueOfBucket.split('(')[1];
             let totalNumberOfBucket = numberOfBucket.split(')')[0];
-            return totalNumberOfBucket;
+            return totalNumberOfBucket.trim();
         });
 
         return bucketNumber;
diff --git a/lib/content-services/search/components/search-check-list/search-check-list.component.html b/lib/content-services/search/components/search-check-list/search-check-list.component.html
index e0cdd7fab4..750990ebfa 100644
--- a/lib/content-services/search/components/search-check-list/search-check-list.component.html
+++ b/lib/content-services/search/components/search-check-list/search-check-list.component.html
@@ -3,8 +3,15 @@
         *ngFor="let option of options"
         [checked]="option.checked"
         [attr.data-automation-id]="'checkbox-' + (option.name)"
-        (change)="changeHandler($event, option)">
-        {{ option.name | translate }}
+        (change)="changeHandler($event, option)"
+        class="facet-filter">
+        <div 
+            matTooltip="{{ option.name | translate }}"
+            matTooltipPosition="right"
+            class="facet-name">
+            {{ option.name | translate }}
+        </div>
+        
     </mat-checkbox>
 </div>
 
diff --git a/lib/content-services/search/components/search-check-list/search-check-list.component.scss b/lib/content-services/search/components/search-check-list/search-check-list.component.scss
index 8380f4aae2..ab6dcc9536 100644
--- a/lib/content-services/search/components/search-check-list/search-check-list.component.scss
+++ b/lib/content-services/search/components/search-check-list/search-check-list.component.scss
@@ -1,4 +1,22 @@
 .adf-search-check-list {
     display: flex;
     flex-direction: column;
+
+    .facet-filter {
+        .mat-checkbox-label {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            width: 100%;
+        }
+    
+        .mat-checkbox-layout {
+            width: 100%;
+        }
+
+        .facet-name {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+    }
 }
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.html b/lib/content-services/search/components/search-filter/search-filter.component.html
index 9b4473c99f..3915d003bb 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.html
+++ b/lib/content-services/search/components/search-filter/search-filter.component.html
@@ -41,7 +41,12 @@
                         [checked]="query.checked"
                         [attr.data-automation-id]="'checkbox-'+facetQueriesLabel+'-'+query.label"
                         (change)="onToggleFacetQuery($event, query)">
-                        {{ query.label | translate }} ({{ query.count }})
+                        <div 
+                            matTooltip="{{ query.label | translate }} ({{ query.count }})"
+                            matTooltipPosition="right"
+                            class="facet-label">
+                            {{ query.label | translate }} ({{ query.count }})
+                        </div>
                     </mat-checkbox>
                 </ng-container>
             </div>
@@ -96,7 +101,15 @@
                     [checked]="bucket.checked"
                     [attr.data-automation-id]="'checkbox-'+field.label+'-'+(bucket.display || bucket.label)"
                     (change)="onToggleBucket($event, field, bucket)">
-                    {{ bucket.display || bucket.label | translate }} <span *ngIf="bucket.count!==null">(</span>{{ bucket.count }}<span *ngIf="bucket.count!==null">)</span>
+                    <div 
+                        matTooltip="{{ bucket.display || bucket.label | translate }}"
+                        matTooltipPosition="right"
+                        class="facet-label">
+                        {{ bucket.display || bucket.label | translate }} 
+                        <span *ngIf="bucket.count!==null">(</span>
+                        {{ bucket.count }}
+                        <span *ngIf="bucket.count!==null">)</span>
+                    </div>
                 </mat-checkbox>
             </div>
 
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.scss b/lib/content-services/search/components/search-filter/search-filter.component.scss
index 34e191091b..1ddbe25db3 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.scss
+++ b/lib/content-services/search/components/search-filter/search-filter.component.scss
@@ -4,6 +4,22 @@
         display: flex;
         flex-direction: column;
 
+        .mat-checkbox-label {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            width: 100%;
+        }
+    
+        .mat-checkbox-layout {
+            width: 100%;
+        }
+
+        .facet-label {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
         .mat-checkbox {
             margin: 5px;
 
diff --git a/lib/content-services/search/components/search-radio/search-radio.component.html b/lib/content-services/search/components/search-radio/search-radio.component.html
index e7cba38b96..0e68a3a5c0 100644
--- a/lib/content-services/search/components/search-radio/search-radio.component.html
+++ b/lib/content-services/search/components/search-radio/search-radio.component.html
@@ -3,8 +3,14 @@
     (change)="changeHandler($event)">
     <mat-radio-button
         *ngFor="let option of options"
-        [value]="option.value">
-        {{ option.name | translate }}
+        [value]="option.value"
+        class="facet-filter">
+        <div 
+            matTooltip="{{ option.name | translate }}"
+            matTooltipPosition="right"
+            class="filter-label">
+            {{ option.name | translate }}
+        </div>
     </mat-radio-button>
 </mat-radio-group>
 
diff --git a/lib/content-services/search/components/search-radio/search-radio.component.scss b/lib/content-services/search/components/search-radio/search-radio.component.scss
index 4229945846..a4b3f13786 100644
--- a/lib/content-services/search/components/search-radio/search-radio.component.scss
+++ b/lib/content-services/search/components/search-radio/search-radio.component.scss
@@ -1,10 +1,28 @@
 .adf-search-radio {
     .mat-radio-group {
-        display: inline-flex;
+        display: flex;
         flex-direction: column;
     }
 
     .mat-radio-button {
         margin: 5px;
     }
+
+    .facet-filter {
+        .mat-radio-label-content {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            width: 100%;
+        }
+    
+        .mat-radio-label {
+            width: 100%;
+        }
+
+        .filter-label {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+    }
 }