diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
index aff507895e6..77589e735ae 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
@@ -1274,6 +1274,7 @@
     %grid-display-container-tr {
         width: 100%;
         overflow: visible;
+        flex: 1;
     }
 
     %grid-mrl-block {
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts
index f0dd4cc9d53..100697489e7 100644
--- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts
@@ -668,6 +668,18 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
             );
             jasmine.getEnv().allowRespy(false);
         });
+
+        it('should calculate correct column headers width when rowSelection + expand indicators', () => {
+            hierarchicalGrid.rowSelection = 'multiple';
+            fixture.detectChanges();
+
+            const headerRowElement = hierarchicalGrid.nativeElement.querySelector("igx-grid-header-row");
+            const headerRowDiv = headerRowElement.querySelector(".igx-grid__tr");
+            const headerRowChildren = Array.from(headerRowDiv.children);
+
+            const elementsWidth = headerRowChildren.reduce((acc,el) => acc+(el as HTMLElement).offsetWidth, 0);
+            expect(elementsWidth).toEqual((headerRowDiv as HTMLElement).offsetWidth);
+        });
     });
 
     describe('IgxHierarchicalGrid Row Islands #hGrid', () => {
@@ -1690,7 +1702,7 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
             UIInteractions.simulateClickAndSelectEvent(row.expander);
             fixture.detectChanges();
 
-            let childGrid = hierarchicalGrid.gridAPI.getChildGrids()[0];
+            const childGrid = hierarchicalGrid.gridAPI.getChildGrids()[0];
             const childRow = childGrid.gridAPI.get_row_by_index(0) as IgxHierarchicalRowComponent;
             UIInteractions.simulateClickAndSelectEvent(childRow.expander);
             fixture.detectChanges();