diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
index 34eab38ed934..515acaed6dc2 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
@@ -35,6 +35,7 @@ import com.intellij.util.ui.MacUIUtil;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.ArrayList;
@@ -267,6 +268,12 @@ public class EditorComboBox extends JComboBox implements DocumentListener {
     setEditor();
 
     super.addNotify();
+    if (UIUtil.isUnderDarcula() || UIUtil.isUnderIntelliJLaF()) {
+      final JScrollPane scrollPane = UIUtil.findComponentOfType(myEditorField, JScrollPane.class);
+      if (scrollPane != null) {
+        scrollPane.setBorder(new EmptyBorder(1,0,1,0));
+      }
+    }
     myEditorField.getFocusTarget().addFocusListener(new FocusAdapter() {
       @Override
       public void focusGained(FocusEvent e) {