diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
index 74b3e8930fb6..b8a57b213f03 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
@@ -243,7 +243,7 @@ public class ComboBox<E> extends ComboBoxWithWidePopup<E> implements AWTEventLis
 
   public final void setEditor(final ComboBoxEditor editor) {
     ComboBoxEditor _editor = editor;
-    if (SystemInfo.isMac && (UIUtil.isUnderAquaLookAndFeel() || UIUtil.isUnderIntelliJLaF())) {
+    if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel()) {
       if (editor instanceof UIResource) {
         _editor = new FixedComboBoxEditor();
       }