diff --git a/src/lib/components/modes/treemode/JSONKey.svelte b/src/lib/components/modes/treemode/JSONKey.svelte
index 9efcf7a7..d53c4626 100644
--- a/src/lib/components/modes/treemode/JSONKey.svelte
+++ b/src/lib/components/modes/treemode/JSONKey.svelte
@@ -64,7 +64,7 @@
   }
 </script>
 
-{#if isEditingKey}
+{#if !context.readOnly && isEditingKey}
   <EditableDiv
     value={context.normalization.escapeValue(key)}
     shortText
diff --git a/src/lib/components/modes/treemode/JSONValue.svelte b/src/lib/components/modes/treemode/JSONValue.svelte
index 274b7587..ef7d0a0b 100644
--- a/src/lib/components/modes/treemode/JSONValue.svelte
+++ b/src/lib/components/modes/treemode/JSONValue.svelte
@@ -12,7 +12,7 @@
   export let selection: JSONSelection | null
   export let searchResultItems: SearchResultItem[] | undefined
 
-  $: isEditing = !context.readOnly && isValueSelection(selection) && isEditingSelection(selection)
+  $: isEditing = isValueSelection(selection) && isEditingSelection(selection)
 
   $: renderers = context.onRenderValue({
     path,
diff --git a/src/lib/components/modes/treemode/TreeMode.svelte b/src/lib/components/modes/treemode/TreeMode.svelte
index 19ace6ea..bdf283c3 100644
--- a/src/lib/components/modes/treemode/TreeMode.svelte
+++ b/src/lib/components/modes/treemode/TreeMode.svelte
@@ -1702,7 +1702,7 @@
 
     if (combo === 'Enter' && documentState.selection) {
       // when the selection consists of a single Array item, change selection to editing its value
-      if (!readOnly && isMultiSelectionWithOneItem(documentState.selection)) {
+      if (isMultiSelectionWithOneItem(documentState.selection)) {
         const path = documentState.selection.focusPath
         const parent = getIn(json, initial(path))
         if (Array.isArray(parent)) {
@@ -1711,7 +1711,7 @@
         }
       }
 
-      if (!readOnly && isKeySelection(documentState.selection)) {
+      if (isKeySelection(documentState.selection)) {
         // go to key edit mode
         event.preventDefault()
         updateSelection({ ...documentState.selection, edit: true })
@@ -1725,10 +1725,8 @@
           // expand object/array
           handleExpand(documentState.selection.path, true)
         } else {
-          if (!readOnly) {
-            // go to value edit mode
-            updateSelection({ ...documentState.selection, edit: true })
-          }
+          // go to value edit mode
+          updateSelection({ ...documentState.selection, edit: true })
         }
       }
     }