diff --git a/src/components/form/Editor.tsx b/src/components/form/Editor.tsx
index 8c11a0d0..ef7061a8 100644
--- a/src/components/form/Editor.tsx
+++ b/src/components/form/Editor.tsx
@@ -47,6 +47,8 @@ const options: monaco.editor.IStandaloneEditorConstructionOptions = {
   // auto adjust width and height to parent
   // see: https://github.com/Microsoft/monaco-editor/issues/543#issuecomment-321767059
   automaticLayout: true,
+  wordWrap: 'on',
+  wrappingIndent: 'indent',
   fontFamily: APP_MONOSPACE_FONT_FAMILY,
   fontSize: APP_CODE_EDITOR_FONT_SIZE,
 };
diff --git a/src/components/form/FormJsonTabs.tsx b/src/components/form/FormJsonTabs.tsx
index 9efc7bb8..9ef90219 100644
--- a/src/components/form/FormJsonTabs.tsx
+++ b/src/components/form/FormJsonTabs.tsx
@@ -669,6 +669,8 @@ export const FormJsonTabs = (props: FormJsonTabsProps) => {
               minimap: { enabled: false },
               renderSideBySide: true,
               automaticLayout: true,
+              wordWrap: 'on',
+              wrappingIndent: 'indent',
               fontFamily: APP_MONOSPACE_FONT_FAMILY,
               fontSize: APP_CODE_EDITOR_FONT_SIZE,
             }}
diff --git a/src/components/form/JsonCodeEditor.tsx b/src/components/form/JsonCodeEditor.tsx
index 6ead5d44..056adcfc 100644
--- a/src/components/form/JsonCodeEditor.tsx
+++ b/src/components/form/JsonCodeEditor.tsx
@@ -28,6 +28,8 @@ import classes from './JsonCodeEditor.module.css';
 const jsonEditorOptions: NonNullable<EditorProps['options']> = {
   minimap: { enabled: false },
   automaticLayout: true,
+  wordWrap: 'on',
+  wrappingIndent: 'indent',
   lineNumbers: 'on',
   lineNumbersMinChars: 3,
   lineDecorationsWidth: 0,