diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsContainer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsContainer.java
index c8ddb9904203f9d7892f69e8d761ae8cc0421335..462a239ea0c5bdf14833426aee5a5fa41d6e48b7 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsContainer.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsContainer.java
@@ -206,10 +206,10 @@ public class GroupingResultsContainer implements IResultSetContainer {
 
     public void setGrouping(List<String> attributes, List<String> functions) {
         groupAttributes.clear();
-        groupAttributes.addAll(attributes);
+        addGroupingAttributes(attributes);
 
         groupFunctions.clear();
-        groupFunctions.addAll(functions);
+        addGroupingFunctions(functions);
 
         resetDataFilters();
     }