diff --git a/src/lib/components/editor/Editor.component.tsx b/src/lib/components/editor/Editor.component.tsx
index b59a7fd21d..544a17fbfb 100644
--- a/src/lib/components/editor/Editor.component.tsx
+++ b/src/lib/components/editor/Editor.component.tsx
@@ -154,6 +154,7 @@ export const Editor = ({
         autocompletion: true,
         highlightActiveLine: true,
         highlightActiveLineGutter: true,
+        highlightSelectionMatches: false,
         indentOnInput: true,
         bracketMatching: true,
         closeBrackets: true,
diff --git a/src/lib/components/editor/editorTheme.ts b/src/lib/components/editor/editorTheme.ts
index b526f5b485..7200f50a7f 100644
--- a/src/lib/components/editor/editorTheme.ts
+++ b/src/lib/components/editor/editorTheme.ts
@@ -46,11 +46,12 @@ export function createEditorTheme(theme: CoreUITheme): Extension {
       '&': {
         backgroundColor: theme.backgroundLevel1,
         color: theme.textPrimary,
+        fontFamily: "'Courier New', monospace",
+        fontSize: '12px',
+        lineHeight: '1.6',
       },
       '.cm-content': {
         caretColor: theme.textPrimary,
-        fontFamily: "'Courier New', monospace",
-        fontSize: '12px',
       },
       '.cm-cursor, .cm-dropCursor': {
         borderLeftColor: theme.textPrimary,