diff --git a/packages/web/src/celldata/TableCellView.svelte b/packages/web/src/celldata/TableCellView.svelte
index 11e2ed021..a6af06974 100644
--- a/packages/web/src/celldata/TableCellView.svelte
+++ b/packages/web/src/celldata/TableCellView.svelte
@@ -20,8 +20,8 @@
   $: rowData = firstSelection?.rowData;
   $: editable = firstSelection?.editable;
   $: editorTypes = firstSelection?.editorTypes;
-  $: columns = selection?.columns || [];
-  $: realColumnUniqueNames = selection?.realColumnUniqueNames || [];
+  $: displayColumns = firstSelection?.displayColumns || [];
+  $: realColumnUniqueNames = firstSelection?.realColumnUniqueNames || [];
   $: setCellValue = selection?.setCellValue;
 
   $: uniqueRows = _.uniqBy(selection || [], 'row');
@@ -48,7 +48,7 @@
 
   $: orderedFields = realColumnUniqueNames
     .map(colName => {
-      const col = columns.find(c => c.uniqueName === colName);
+      const col = displayColumns.find(c => c.uniqueName === colName);
       if (!col) return null;
       const { value, hasMultipleValues } = getFieldValue(colName);
       return {
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 629f7d7ff..ed58051df 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -1248,6 +1248,8 @@
       engine: display?.driver,
       editable: grider.editable,
       editorTypes: display?.driver?.dataEditorTypesBehaviour,
+      displayColumns: columns,
+      realColumnUniqueNames,
     };
 
     const rowIndexes = _.sortBy(_.uniq(regular.map(x => x[0])));
@@ -1286,9 +1288,6 @@
       })
       .filter(x => x.column);
 
-    res.columns = columns;
-    res.realColumnUniqueNames = realColumnUniqueNames;
-
     if (res.length > 0) {
       const uniqueRowIndices = _.uniq(res.map(x => x.row));
       res.setCellValue = (columnName, value) => {