diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index a3b79d35d8..6e12c56efc 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -103,6 +103,8 @@ import { cellImagePreviewUrl } from "@/lib/cellImageUrl";
 import {
   cellDetailEditorText,
   defaultCellDetailTab,
+  formatJsonText,
+  isJsonColumnType,
   valueEditorActions,
   visibleCellDetailTabs,
   type CellDetailTab,
@@ -1774,7 +1776,10 @@ watch(activeCellDetailTab, (tab) => {
 
 const activeValueEditorActions = computed(() => {
   const detail = activeCellDetail.value;
-  return valueEditorActions({ canSetNull: !!detail?.isEditable && detail.value !== null });
+  return valueEditorActions({
+    canSetNull: !!detail?.isEditable && detail.value !== null,
+    canFormatJson: !!detail?.isEditable && isJsonColumnType(detail?.type),
+  });
 });
 
 const detailEditValue = ref("");
@@ -1798,7 +1803,7 @@ function closeCellDetails() {
 function startDetailEdit() {
   const detail = activeCellDetail.value;
   if (!detail || !detail.isEditable) return;
-  detailEditValue.value = cellDetailEditorText(detail.value);
+  detailEditValue.value = cellDetailEditorText(detail.value, detail.type);
   isEditingDetail.value = true;
 }
 
@@ -1842,7 +1847,7 @@ function cancelDetailEdit() {
 function cancelValueEditorEdit() {
   const detail = activeCellDetail.value;
   if (!detail || !detail.isEditable) return;
-  detailEditValue.value = cellDetailEditorText(detail.value);
+  detailEditValue.value = cellDetailEditorText(detail.value, detail.type);
   isEditingDetail.value = true;
 }
 
@@ -1873,7 +1878,7 @@ function restoreDetailOriginalValue() {
     dirtyRows.value = new Map(dirtyRows.value);
   }
 
-  detailEditValue.value = cellDetailEditorText(restoredValue);
+  detailEditValue.value = cellDetailEditorText(restoredValue, detail.type);
   isEditingDetail.value = activeCellDetailTab.value === "valueEditor";
   detailCell.value = { ...detailCell.value! };
 }
@@ -1884,6 +1889,12 @@ function setValueEditorNull() {
   isEditingDetail.value = activeCellDetailTab.value === "valueEditor";
 }
 
+function formatValueEditorJson() {
+  const detail = activeCellDetail.value;
+  if (!detail || !isJsonColumnType(detail.type)) return;
+  detailEditValue.value = formatJsonText(detailEditValue.value) ?? detailEditValue.value;
+}
+
 function setDetailNull() {
   const detail = activeCellDetail.value;
   if (!detail || !detail.isEditable) return;
@@ -4267,6 +4278,16 @@ defineExpose({
                     />
                   </div>
                   <div class="flex gap-1 mt-2 shrink-0">
+                    <Button
+                      v-if="activeValueEditorActions.includes('formatJson')"
+                      variant="outline"
+                      size="sm"
+                      class="h-6 text-xs"
+                      @mousedown.prevent
+                      @click="formatValueEditorJson"
+                    >
+                      {{ t("grid.formatJson") }}
+                    </Button>
                     <Button
                       v-if="activeValueEditorActions.includes('setNull')"
                       variant="outline"
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index e3450080cb..ec7e43f263 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -374,6 +374,7 @@ export default {
     rawValue: "Raw Value",
     copyValue: "Copy Value",
     editValue: "Edit Value",
+    formatJson: "Format JSON",
     setNull: "Set NULL",
     restoreOriginalValue: "Restore Original",
     copyColumnName: "Copy Column Name",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 6265f5e4b9..4b89b8a5b3 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -342,6 +342,7 @@ export default {
     rawValue: "Valor sin procesar",
     copyValue: "Copiar valor",
     editValue: "Editar valor",
+    formatJson: "Formatear JSON",
     setNull: "Establecer NULL",
     restoreOriginalValue: "Restaurar original",
     copyColumnName: "Copiar nombre de columna",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 49f86a859b..56cb51193e 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -371,6 +371,7 @@ export default {
     rawValue: "原始值",
     copyValue: "复制值",
     editValue: "编辑值",
+    formatJson: "格式化 JSON",
     setNull: "设为 NULL",
     restoreOriginalValue: "恢复原值",
     copyColumnName: "复制列名",
diff --git a/apps/desktop/src/lib/cellDetailPresentation.ts b/apps/desktop/src/lib/cellDetailPresentation.ts
index 9ba8c19d3f..962ea62f47 100644
--- a/apps/desktop/src/lib/cellDetailPresentation.ts
+++ b/apps/desktop/src/lib/cellDetailPresentation.ts
@@ -1,5 +1,5 @@
 export type CellDetailTab = "details" | "valueEditor";
-export type ValueEditorAction = "setNull" | "restoreOriginal";
+export type ValueEditorAction = "formatJson" | "setNull" | "restoreOriginal";
 
 export interface CellDetailPresentationOptions {
   isEditable: boolean;
@@ -17,12 +17,38 @@ export function visibleCellDetailTabs(options: CellDetailPresentationOptions): C
   return tabs;
 }
 
-export function cellDetailEditorText(value: unknown): string {
+export function cellDetailEditorText(value: unknown, columnType?: string): string {
   if (value === null) return "";
+  if (isJsonColumnType(columnType)) {
+    const text = typeof value === "object" ? JSON.stringify(value) : String(value);
+    return formatJsonText(text) ?? text;
+  }
   if (typeof value === "object") return JSON.stringify(value);
   return String(value);
 }
 
-export function valueEditorActions(options: { canSetNull: boolean }): ValueEditorAction[] {
-  return options.canSetNull ? ["setNull", "restoreOriginal"] : ["restoreOriginal"];
+export function valueEditorActions(options: { canSetNull: boolean; canFormatJson?: boolean }): ValueEditorAction[] {
+  const actions: ValueEditorAction[] = [];
+  if (options.canFormatJson) actions.push("formatJson");
+  if (options.canSetNull) actions.push("setNull");
+  actions.push("restoreOriginal");
+  return actions;
+}
+
+export function isJsonColumnType(columnType: string | undefined): boolean {
+  const base = (columnType ?? "")
+    .trim()
+    .toLowerCase()
+    .split(/[(:\s]/)[0];
+  return base === "json" || base === "jsonb";
+}
+
+export function formatJsonText(text: string): string | undefined {
+  const trimmed = text.trim();
+  if (!trimmed) return undefined;
+  try {
+    return JSON.stringify(JSON.parse(trimmed), null, 2);
+  } catch {
+    return undefined;
+  }
 }
diff --git a/packages/app-tests/cellDetailPresentation.test.ts b/packages/app-tests/cellDetailPresentation.test.ts
index 8a28d164b0..b2e6a8b148 100644
--- a/packages/app-tests/cellDetailPresentation.test.ts
+++ b/packages/app-tests/cellDetailPresentation.test.ts
@@ -33,7 +33,20 @@ test("cell detail value editor restores the original value text on cancel", () =
   assert.equal(cellDetailEditorText("already text"), "already text");
 });
 
+test("cell detail value editor formats json typed string values", () => {
+  assert.equal(
+    cellDetailEditorText('{"nested":true,"items":[1,2]}', "jsonb"),
+    '{\n  "nested": true,\n  "items": [\n    1,\n    2\n  ]\n}',
+  );
+  assert.equal(cellDetailEditorText('{"nested":true}', "varchar"), '{"nested":true}');
+  assert.equal(cellDetailEditorText("{invalid", "json"), "{invalid");
+});
+
 test("cell detail value editor uses cell actions instead of confirm and cancel", () => {
-  assert.deepEqual(valueEditorActions({ canSetNull: true }), ["setNull", "restoreOriginal"]);
+  assert.deepEqual(valueEditorActions({ canSetNull: true, canFormatJson: true }), [
+    "formatJson",
+    "setNull",
+    "restoreOriginal",
+  ]);
   assert.deepEqual(valueEditorActions({ canSetNull: false }), ["restoreOriginal"]);
 });