diff --git a/src/UiGridAutoFitColumnsService.ts b/src/UiGridAutoFitColumnsService.ts
index 939b8cf..e6ea6fa 100644
--- a/src/UiGridAutoFitColumnsService.ts
+++ b/src/UiGridAutoFitColumnsService.ts
@@ -102,7 +102,13 @@ export class UiGridAutoFitColumnsService {
 
             if (column.colDef.enableColumnAutoFit) {
                 const columnKey = column.field || column.name;
-                optimalWidths[columnKey] = Measurer.measureRoundedTextWidth(column.displayName, this.gridMetrics.getHeaderFont()) + this.gridMetrics.getHeaderButtonsWidth();
+
+                let headerText = column.displayName;
+
+                if (!!column.colDef.headerCellFilter) {
+                    headerText = this.getFilteredValue(headerText, column.colDef.headerCellFilter);
+                }
+                optimalWidths[columnKey] = Measurer.measureRoundedTextWidth(headerText, this.gridMetrics.getHeaderFont()) + this.gridMetrics.getHeaderButtonsWidth();
 
                 rows.forEach((row) => {
                     let cellText = get(row.entity, columnKey);