diff --git a/services/web/frontend/js/features/history/extensions/theme.ts b/services/web/frontend/js/features/history/extensions/theme.ts
index 8ddf312748..3c51968e74 100644
--- a/services/web/frontend/js/features/history/extensions/theme.ts
+++ b/services/web/frontend/js/features/history/extensions/theme.ts
@@ -45,7 +45,13 @@ const createThemeFromOptions = ({
   ]
 }
 
-const baseTheme = EditorView.theme({
+const baseTheme = EditorView.baseTheme({
+  '&light.cm-editor': {
+    colorScheme: 'light',
+  },
+  '&dark.cm-editor': {
+    colorScheme: 'dark',
+  },
   '.cm-content': {
     fontSize: 'var(--font-size)',
     fontFamily: 'var(--source-font-family)',
diff --git a/services/web/frontend/js/features/source-editor/extensions/theme.ts b/services/web/frontend/js/features/source-editor/extensions/theme.ts
index 7b0d78f73c..fb82a45644 100644
--- a/services/web/frontend/js/features/source-editor/extensions/theme.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/theme.ts
@@ -92,6 +92,12 @@ const createThemeFromOptions = ({
  * Base styles that can have &dark and &light variants
  */
 const baseTheme = EditorView.baseTheme({
+  '&light.cm-editor': {
+    colorScheme: 'light',
+  },
+  '&dark.cm-editor': {
+    colorScheme: 'dark',
+  },
   '.cm-content': {
     fontSize: 'var(--font-size)',
     fontFamily: 'var(--source-font-family)',