diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 607cf2d7b2f..4c37b823639 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -315,8 +315,8 @@ var PivotModel = AbstractModel.extend({
         if (!this.data.has_data) {
             return {
                 has_data: false,
-                colGroupBys: this.data.main_col.groupbys,
-                rowGroupBys:  this.data.main_row.groupbys,
+                colGroupBys: this.data.main_col.root.groupbys,
+                rowGroupBys:  this.data.main_row.root.groupbys,
                 measures: this.data.measures,
             };
         }
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index 8f136f69858..4b9282c4bb4 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -967,7 +967,7 @@ QUnit.module('Views', {
         }, "context should be correct");
 
         pivot.$('tbody .o_pivot_header_cell_closed').click();
-        pivot.$('.o_pivot_field_menu li[data-field=product_id] a').click();
+        pivot.$('.o_pivot_field_menu .dropdown-item[data-field="product_id"]:first').click();
 
         assert.deepEqual(pivot.getContext(), {
             pivot_column_groupby: [],
@@ -976,7 +976,7 @@ QUnit.module('Views', {
         }, "context should be correct");
 
         pivot.$('thead .o_pivot_header_cell_closed').click();
-        pivot.$('.o_pivot_field_menu li[data-field=customer] a').click();
+        pivot.$('.o_pivot_field_menu .dropdown-item[data-field="customer"]:first').click();
 
         assert.deepEqual(pivot.getContext(), {
             pivot_column_groupby: ['customer'],