diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
index 4563c19def26..34eab38ed934 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import com.intellij.util.ui.UIUtil;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -335,6 +335,9 @@ public class EditorComboBox extends JComboBox implements DocumentListener {
   }
 
   public Dimension getPreferredSize() {
+    if (UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula()) {
+      return super.getPreferredSize();
+    }
     if (myEditorField != null) {
       final Dimension preferredSize = new Dimension(myEditorField.getComponent().getPreferredSize());
       final Insets insets = getInsets();