diff --git a/packages/kbn-esql-editor/src/esql_editor.tsx b/packages/kbn-esql-editor/src/esql_editor.tsx
index 767bc9026348..eb3da01abd50 100644
--- a/packages/kbn-esql-editor/src/esql_editor.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.tsx
@@ -585,7 +585,7 @@ export const ESQLEditor = memo(function ESQLEditor({
     lightbulb: {
       enabled: false,
     },
-    lineDecorationsWidth: 12,
+    lineDecorationsWidth: 20,
     lineNumbers: 'on',
     lineNumbersMinChars: 3,
     minimap: { enabled: false },
@@ -601,7 +601,9 @@ export const ESQLEditor = memo(function ESQLEditor({
     renderLineHighlightOnlyWhenFocus: true,
     scrollbar: {
       horizontal: 'hidden',
+      horizontalScrollbarSize: 6,
       vertical: 'auto',
+      verticalScrollbarSize: 6,
     },
     scrollBeyondLastLine: false,
     theme: darkMode ? ESQL_DARK_THEME_ID : ESQL_LIGHT_THEME_ID,
diff --git a/packages/kbn-esql-editor/src/overwrite.scss b/packages/kbn-esql-editor/src/overwrite.scss
index 0f675c02cd76..9e716b55f3e2 100644
--- a/packages/kbn-esql-editor/src/overwrite.scss
+++ b/packages/kbn-esql-editor/src/overwrite.scss
@@ -29,15 +29,11 @@
   @include euiTextBreakWord;
 }
 
-// All scrollable containers (e.g. main container and suggest menu)
-.ESQLEditor .monaco-editor .monaco-scrollable-element {
-  margin-left: $euiSizeS;
+// Space between the autocomplete menu and expanded suggestion details
+.ESQLEditor .monaco-editor .suggest-details {
+  padding-left: $euiSizeS;
 }
 
-.ESQLEditor .monaco-editor .monaco-list .monaco-scrollable-element {
-  margin-left: 0;
-
-  .monaco-list-row.focused {
-    border-radius: $euiBorderRadius;
-  }
+.ESQLEditor .monaco-editor .monaco-list .monaco-scrollable-element .monaco-list-row.focused {
+  border-radius: $euiBorderRadius;
 }
\ No newline at end of file