diff --git a/ui/src/components/AdvancedConfigEditor.tsx b/ui/src/components/AdvancedConfigEditor.tsx
index ad6f916..f7fc6f9 100644
--- a/ui/src/components/AdvancedConfigEditor.tsx
+++ b/ui/src/components/AdvancedConfigEditor.tsx
@@ -52,6 +52,9 @@ export default function AdvancedConfigEditor<T>({ config, setConfig, transformOn
     monacoRef.current = monaco;
     isEditorMounted.current = true;
 
+    // Model auto-detects indentation on creation; force 2 spaces
+    editor.getModel()?.updateOptions({ tabSize: 2, insertSpaces: true });
+
     // Initial content setup
     try {
       const yamlContent = toYaml(config);
@@ -161,6 +164,9 @@ export default function AdvancedConfigEditor<T>({ config, setConfig, transformOn
           minimap: { enabled: true },
           scrollBeyondLastLine: false,
           automaticLayout: true,
+          tabSize: 2,
+          insertSpaces: true,
+          detectIndentation: false,
         }}
       />
     </div>