diff --git a/frontend/src/components/MonacoEditor.tsx b/frontend/src/components/MonacoEditor.tsx
index ff25ce7..1153802 100644
--- a/frontend/src/components/MonacoEditor.tsx
+++ b/frontend/src/components/MonacoEditor.tsx
@@ -113,7 +113,10 @@ const MonacoEditor: React.FC<MonacoEditorProps> = ({
 
   const resolvedOptions = useMemo(() => {
     if (uiVersion !== 'v2') {
-      return options;
+      return {
+        ...options,
+        editContext: false,
+      };
     }
 
     const effectiveGlobalFontSize = Math.min(
@@ -129,6 +132,7 @@ const MonacoEditor: React.FC<MonacoEditorProps> = ({
 
     return {
       ...options,
+      editContext: false,
       fontFamily: options?.fontFamily ?? monoFontFamily ?? DEFAULT_MONO_FONT_FAMILY,
       fontSize: options?.fontSize ?? resolvedFontSize,
       lineHeight: options?.lineHeight ?? Math.max(18, Math.round(resolvedFontSize * 1.62)),
diff --git a/frontend/src/components/MonacoEditor.typography.test.tsx b/frontend/src/components/MonacoEditor.typography.test.tsx
index dc8a475..b90d625 100644
--- a/frontend/src/components/MonacoEditor.typography.test.tsx
+++ b/frontend/src/components/MonacoEditor.typography.test.tsx
@@ -57,6 +57,7 @@ describe('MonacoEditor typography', () => {
       <MonacoEditor options={{ minimap: { enabled: false } }} />,
     );
 
+    expect(markup).toContain('&quot;editContext&quot;:false');
     expect(markup).toContain('JetBrains Mono');
     expect(markup).toContain('ui-monospace');
     expect(markup).toContain('&quot;fontSize&quot;:13');
@@ -83,6 +84,7 @@ describe('MonacoEditor typography', () => {
       <MonacoEditor options={{ fontFamily: 'Consolas', fontSize: 18 }} />,
     );
 
+    expect(markup).toContain('&quot;editContext&quot;:false');
     expect(markup).toContain('&quot;fontFamily&quot;:&quot;Consolas&quot;');
     expect(markup).toContain('&quot;fontSize&quot;:18');
     expect(markup).not.toContain('JetBrains Mono');