diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index c4b9bfeb032a..564df2176498 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -443,6 +443,10 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
       uiDefaults.put("Menu.disabledArrowIcon", getAquaMenuDisabledIcon());
     }
 
+    if (UIUtil.isWinLafOnVista()) {
+      uiDefaults.put("ComboBox.border", null);
+    }
+
     initInputMapDefaults(uiDefaults);
 
     UIManager.put("Button.defaultButtonFollowsFocus", Boolean.FALSE);