diff --git a/packages/tools/src/stringTools.ts b/packages/tools/src/stringTools.ts
index 3b93522d2..f2eeacff9 100644
--- a/packages/tools/src/stringTools.ts
+++ b/packages/tools/src/stringTools.ts
@@ -150,7 +150,7 @@ export function stringifyCellValue(
 
   if (value === true) return { value: 'true', gridStyle: 'valueCellStyle' };
   if (value === false) return { value: 'false', gridStyle: 'valueCellStyle' };
-  
+
   if (editorTypes?.parseHexAsBuffer) {
     if (value?.type == 'Buffer' && _isArray(value.data)) {
       return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
@@ -167,28 +167,26 @@ export function stringifyCellValue(
       }
     }
   }
-  if (editorTypes?.parseJsonArray) {
-    if (_isArray(value)) {
-      switch (intent) {
-        case 'gridCellIntent':
-          return stringifyJsonToGrid(value);
-        case 'multilineEditorIntent':
-          return { value: JSON.stringify(value) };
-        default:
-          return { value: JSON.stringify(value, null, 2), gridStyle: 'valueCellStyle' };
-      }
+
+  if (_isArray(value)) {
+    switch (intent) {
+      case 'gridCellIntent':
+        return stringifyJsonToGrid(value);
+      case 'multilineEditorIntent':
+        return { value: JSON.stringify(value, null, 2) };
+      default:
+        return { value: JSON.stringify(value), gridStyle: 'valueCellStyle' };
     }
   }
-  if (editorTypes?.parseJsonObject) {
-    if (_isPlainObject(value)) {
-      switch (intent) {
-        case 'gridCellIntent':
-          return stringifyJsonToGrid(value);
-        case 'multilineEditorIntent':
-          return { value: JSON.stringify(value) };
-        default:
-          return { value: JSON.stringify(value, null, 2), gridStyle: 'valueCellStyle' };
-      }
+
+  if (_isPlainObject(value)) {
+    switch (intent) {
+      case 'gridCellIntent':
+        return stringifyJsonToGrid(value);
+      case 'multilineEditorIntent':
+        return { value: JSON.stringify(value, null, 2) };
+      default:
+        return { value: JSON.stringify(value), gridStyle: 'valueCellStyle' };
     }
   }
 
diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte
index f6d9b80e7..54825b543 100644
--- a/packages/web/src/datagrid/DataGridCell.svelte
+++ b/packages/web/src/datagrid/DataGridCell.svelte
@@ -3,10 +3,7 @@
   import ShowFormButton from '../formview/ShowFormButton.svelte';
   import { detectTypeIcon, getConvertValueMenu, isJsonLikeLongString, safeJsonParse } from 'dbgate-tools';
   import { openJsonDocument } from '../tabs/JsonTab.svelte';
-  import openNewTab from '../utility/openNewTab';
   import CellValue from './CellValue.svelte';
-  import { showModal } from '../modals/modalTools';
-  import EditCellDataModal from '../modals/EditCellDataModal.svelte';
   import { openJsonLinesData } from '../utility/openJsonLinesData';
   import ShowFormDropDownButton from '../formview/ShowFormDropDownButton.svelte';
 
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index fc5031724..c8a637957 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -343,7 +343,7 @@
 
 <script lang="ts">
   import { GridDisplay } from 'dbgate-datalib';
-  import { driverBase, parseCellValue, detectSqlFilterBehaviour } from 'dbgate-tools';
+  import { driverBase, parseCellValue, detectSqlFilterBehaviour, stringifyCellValue } from 'dbgate-tools';
   import { getContext, onDestroy } from 'svelte';
   import _, { map } from 'lodash';
   import registerCommand from '../commands/registerCommand';
@@ -811,7 +811,7 @@
     const cellData = rowData[realColumnUniqueNames[currentCell[1]]];
 
     showModal(EditCellDataModal, {
-      value: cellData?.toString() || '',
+      value: stringifyCellValue(cellData, 'multilineEditorIntent').value,
       onSave: value => grider.setCellValue(currentCell[0], realColumnUniqueNames[currentCell[1]], value),
     });
   }
@@ -1246,7 +1246,7 @@
     const cellData = rowData[realColumnUniqueNames[cell[1]]];
     if (shouldOpenMultilineDialog(cellData)) {
       showModal(EditCellDataModal, {
-        value: cellData,
+        value: stringifyCellValue(cellData, 'multilineEditorIntent').value,
         onSave: value => grider.setCellValue(cell[0], realColumnUniqueNames[cell[1]], value),
       });
       return true;
diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte
index 10e27a633..5651ea36d 100644
--- a/packages/web/src/formview/FormView.svelte
+++ b/packages/web/src/formview/FormView.svelte
@@ -157,7 +157,7 @@
 <script lang="ts">
   import { getFilterValueExpression } from 'dbgate-filterparser';
 
-  import { filterName } from 'dbgate-tools';
+  import { filterName, stringifyCellValue } from 'dbgate-tools';
 
   import _ from 'lodash';
 
@@ -490,7 +490,7 @@
     const cellData = rowData[column.uniqueName];
     if (shouldOpenMultilineDialog(cellData)) {
       showModal(EditCellDataModal, {
-        value: cellData,
+        value: stringifyCellValue(cellData, 'multilineEditorIntent').value,
         onSave: value => grider.setCellValue(0, column.uniqueName, value),
       });
       return true;
diff --git a/packages/web/src/modals/EditCellDataModal.svelte b/packages/web/src/modals/EditCellDataModal.svelte
index 9b6918ce3..76a1ddea8 100644
--- a/packages/web/src/modals/EditCellDataModal.svelte
+++ b/packages/web/src/modals/EditCellDataModal.svelte
@@ -9,6 +9,15 @@
         return true;
       }
     }
+    if (value?.$oid) {
+      return false;
+    }
+    if (value?.$date) {
+      return false;
+    }
+    if (_.isPlainObject(value) || _.isArray(value)) {
+      return true;
+    }
     return false;
   }
 </script>