diff --git a/packages/web/src/datagrid/DataGridRow.js b/packages/web/src/datagrid/DataGridRow.js
index dd10015fb..670f98ef3 100644
--- a/packages/web/src/datagrid/DataGridRow.js
+++ b/packages/web/src/datagrid/DataGridRow.js
@@ -169,7 +169,7 @@ function DataGridRow({
   // });
 
   // console.log('RENDER ROW', rowIndex);
-  
+
   const rowDefinition = display.getChangeSetRow(row, insertedRowIndex);
   const [matchedField, matchedChangeSetItem] = findExistingChangeSetItem(changeSet, rowDefinition);
   const rowUpdated = matchedChangeSetItem ? { ...row, ...matchedChangeSetItem.fields } : row;
diff --git a/packages/web/src/datagrid/gridutil.ts b/packages/web/src/datagrid/gridutil.ts
index 4891a0832..d305a77a4 100644
--- a/packages/web/src/datagrid/gridutil.ts
+++ b/packages/web/src/datagrid/gridutil.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { SeriesSizes } from './SeriesSizes';
 import { CellAddress } from './selection';
 
@@ -108,10 +109,10 @@ export function countVisibleRealColumns(columnSizes, firstVisibleColumnScrollInd
 }
 
 export function filterCellForRow(cell, row: number): CellAddress | null {
-  return cell && cell[0] == row ? cell : null;
+  return cell && cell[0] == row && _.isString(cell[0]) ? cell : null;
 }
 
 export function filterCellsForRow(cells, row: number): CellAddress[] | null {
-  const res = (cells || []).filter(x => x[0] == row);
+  const res = (cells || []).filter(x => x[0] == row || _.isString(x[0]));
   return res.length > 0 ? res : null;
 }