diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte
index 82552b541..34cf70879 100644
--- a/packages/web/src/datagrid/DataGridCell.svelte
+++ b/packages/web/src/datagrid/DataGridCell.svelte
@@ -41,7 +41,7 @@
   import { showModal } from '../modals/modalTools';
   import DictionaryLookupModal from '../modals/DictionaryLookupModal.svelte';
   import { openJsonDocument } from '../tabs/JsonTab.svelte';
-import openNewTab from '../utility/openNewTab';
+  import openNewTab from '../utility/openNewTab';
 
   export let rowIndex;
   export let col;
@@ -153,7 +153,7 @@ import openNewTab from '../utility/openNewTab';
   {/if}
 
   {#if isJson}
-    <ShowFormButton icon="icon open-in-new" on:click={() => openJsonDocument(value)} />
+    <ShowFormButton icon="icon open-in-new" on:click={() => openJsonDocument(value, undefined, true)} />
   {/if}
 
   {#if _.isArray(value)}
diff --git a/packages/web/src/jsontree/JSONNode.svelte b/packages/web/src/jsontree/JSONNode.svelte
index 41a106a15..3f4d4e3d5 100644
--- a/packages/web/src/jsontree/JSONNode.svelte
+++ b/packages/web/src/jsontree/JSONNode.svelte
@@ -7,12 +7,13 @@
   import JSONValueNode from './JSONValueNode.svelte';
   import ErrorNode from './ErrorNode.svelte';
   import objType from './objType';
+  import { getContext } from 'svelte';
 
   export let key;
   export let value;
   export let isParentExpanded;
   export let isParentArray;
-  export let expanded = false;
+  export let expanded = !!getContext('json-tree-default-expanded');
   export let labelOverride = null;
 
   $: nodeType = objType(value);
diff --git a/packages/web/src/jsontree/JSONTree.svelte b/packages/web/src/jsontree/JSONTree.svelte
index 42983c3b7..89abfcfdd 100644
--- a/packages/web/src/jsontree/JSONTree.svelte
+++ b/packages/web/src/jsontree/JSONTree.svelte
@@ -10,13 +10,16 @@
   export let key = '';
   export let menu = null;
   export let value;
-  export let expanded = false;
+  export let expandAll = false;
+  export let expanded = expandAll;
   export let labelOverride = null;
 
   export let isDeleted;
   export let isInserted;
   export let isModified;
 
+  setContext('json-tree-default-expanded', expandAll);
+
   const elementData = new WeakMap();
 
   if (elementData) {
diff --git a/packages/web/src/tabs/JsonTab.svelte b/packages/web/src/tabs/JsonTab.svelte
index 37348b8a3..41ee22455 100644
--- a/packages/web/src/tabs/JsonTab.svelte
+++ b/packages/web/src/tabs/JsonTab.svelte
@@ -1,10 +1,13 @@
 <script lang="ts" context="module">
-  export function openJsonDocument(json, title = 'JSON') {
+  export function openJsonDocument(json, title = 'JSON', expandAll = false) {
     openNewTab(
       {
         title,
         icon: 'img json',
         tabComponent: 'JsonTab',
+        props: {
+          expandAll,
+        },
       },
       { editor: json }
     );
@@ -21,6 +24,7 @@
   export let selection;
   export let showWholeRow = false;
   export let tabid;
+  export let expandAll;
 
   let json = null;
   let error = null;
@@ -35,7 +39,7 @@
 
 <div class="outer">
   <div class="inner">
-    <JSONTree value={json} expanded />
+    <JSONTree value={json} {expandAll} />
   </div>
 </div>