diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
index 9dec25c6692c..1b99139d96dc 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
@@ -148,7 +148,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
 CheckBox.borderInsets=2,3,3,0
 
 ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI
-ComboBox.padding=1,5,1,5
+ComboBox.padding=1,5,1,4
 ComboBox.disabledBackground=3c3f41
 ComboBox.disabledForeground=b1b1b1
 ComboBox.nonEditableBackground=3c3f41
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
index 5e05522d878e..b8d5d3fdc603 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -576,8 +576,13 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB
 
   @Override
   protected Rectangle rectangleForCurrentValue() {
-    Rectangle rect = super.rectangleForCurrentValue();
+    Rectangle rect = new Rectangle(comboBox.getSize());
+    Insets i = getInsets();
+
+    JBInsets.removeFrom(rect, i);
+    rect.width -= arrowButton != null ? (arrowButton.getWidth() - i.left) : rect.height;
     JBInsets.removeFrom(rect, padding);
+
     rect.width += comboBox.isEditable() ? 0 : padding.right;
     return rect;
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
index aa100972aad9..79d14a8d9a60 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
@@ -334,6 +334,13 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple
       }
     }
 
+    @Override
+    public void mouseExited(MouseEvent e) {
+      if (!icons.isEmpty()) {
+        handleMouse(e, false);
+      }
+    }
+
     @Override
     public void mouseClicked(MouseEvent e) {
       if (!icons.isEmpty()) {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
index 242f30e0dc26..8cd7ec0b3df1 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
@@ -121,7 +121,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
 CheckBox.borderInsets=3,2,2,0
 
 ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI
-ComboBox.padding=1,5,1,5
+ComboBox.padding=1,5,1,4
 ComboBox.disabledBackground=f2f2f2
 ComboBox.disabledForeground=b1b1b1
 ComboBox.nonEditableBackground=ffffff
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties
index 89a6e61d5302..bcbfbc770c61 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties
@@ -65,7 +65,7 @@ Spinner.border=com.intellij.ide.ui.laf.intellij.MacIntelliJSpinnerBorder
 
 ComboBoxUI=com.intellij.ide.ui.laf.intellij.MacIntelliJComboBoxUI
 ComboBox.border=com.intellij.ide.ui.laf.intellij.MacIntelliJComboBoxBorder
-ComboBox.padding=1,5,1,5
+ComboBox.padding=1,5,1,4
 ComboBox.background=ffffff
 ComboBox.disabledBackground=ececec
 
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
index 936618b6182f..50443d0fe6e2 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
@@ -123,7 +123,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
 CheckBox.borderInsets=1,1,1,0
 
 ComboBoxUI=com.intellij.ide.ui.laf.intellij.WinIntelliJComboBoxUI
-ComboBox.padding=1,5,1,5
+ComboBox.padding=1,5,1,4
 ComboBox.disabledBackground=f2f2f2
 
 RadioButtonUI=com.intellij.ide.ui.laf.intellij.WinIntelliJRadioButtonUI