diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 645eb6fa3..ee9046338 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -523,6 +523,7 @@
           rowData,
           column,
           value: rowData && rowData[column],
+          engine: display?.driver,
         };
       })
       .filter(x => x.column);
diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte
index 953877279..636b1e34a 100644
--- a/packages/web/src/widgets/CellDataWidget.svelte
+++ b/packages/web/src/widgets/CellDataWidget.svelte
@@ -27,6 +27,9 @@
   ];
 
   function autodetect(selection) {
+    if (selection[0]?.engine?.dialect?.nosql) {
+      return 'jsonRow';
+    }
     const value = selection.length == 1 ? selection[0].value : null;
     if (_.isString(value)) {
       if (value.startsWith('[') || value.startsWith('{')) return 'json';