diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts
index 9a4d6ecf10f..c5024c1306a 100644
--- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts
+++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.component.ts
@@ -272,11 +272,7 @@ export class IgxPivotDataSelectorComponent {
     @Input()
     public set grid(value: PivotGridType) {
         this._grid = value;
-        this.dims = [
-            ...this._grid.pivotConfiguration.columns,
-            ...this._grid.pivotConfiguration.rows,
-            ...this._grid.pivotConfiguration.filters,
-        ];
+        this.dims = this._grid.allDimensions;
         this.values = this._grid.pivotConfiguration.values;
     }
 
diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts
index 4b96b57cb41..352b6105254 100644
--- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts
@@ -39,8 +39,8 @@ describe("Pivot data selector", () => {
         grid = fixture.componentInstance.pivotGrid;
         selector = fixture.componentInstance.dataSelector;
         pivotItems = [
-            ...grid.pivotConfiguration.columns,
             ...grid.pivotConfiguration.rows,
+            ...grid.pivotConfiguration.columns,
             ...grid.pivotConfiguration.filters,
             ...grid.pivotConfiguration.values,
         ];
diff --git a/src/app/pivot-grid/pivot-grid.sample.ts b/src/app/pivot-grid/pivot-grid.sample.ts
index 74fca84ea04..93cd355811f 100644
--- a/src/app/pivot-grid/pivot-grid.sample.ts
+++ b/src/app/pivot-grid/pivot-grid.sample.ts
@@ -164,9 +164,6 @@ export class PivotGridSampleComponent {
                     downFont1: (rowData: any, columnKey: any): boolean => rowData[columnKey] <= 50
                 },
             }
-        ],
-        filters: [
-           
         ]
     };