diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
index b7b4d5ec0617..836dd74fc0f3 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
@@ -122,7 +122,14 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
 
   @Override
   public JComponent createCustomComponent(final Presentation presentation) {
-    ComboBoxButton button = createComboBoxButton(presentation);
+    ComboBoxButton button = new ComboBoxButton(presentation) {
+      @Override
+      public Dimension getPreferredSize() {
+        Dimension d = super.getPreferredSize();
+        d.width = Math.max(d.width, JBUI.scale(75));
+        return d;
+      }
+    };
     NonOpaquePanel panel = new NonOpaquePanel(new BorderLayout());
     panel.setBorder(JBUI.Borders.emptyRight(2));
     panel.add(button);
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
index 9dfe9a6dccf2..a436246510f5 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
@@ -484,9 +484,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
       boolean isEmpty = getIcon() == null && StringUtil.isEmpty(getText());
 
       int x = size.width - icon.getIconWidth();
-      if (isEmpty) {
-        x /= 2;
-      } else {
+      if (!isEmpty) {
         if (UIUtil.isUnderWin10LookAndFeel()) {
           x -= JBUI.scale(6);
           x -= JBUI.scale(UIUtil.getParentOfType(ActionToolbar.class, this) != null ? 2 : 0);