diff --git a/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java b/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java
index 996ae90ea7b4..1fce5a333a96 100644
--- a/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java
+++ b/platform/platform-api/src/com/intellij/ui/AbstractCollectionComboBoxModel.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.Collection;
+import java.util.List;
 
 /**
  * @author traff
@@ -31,8 +31,8 @@ public abstract class AbstractCollectionComboBoxModel<T> extends CollectionListM
     mySelection = selection;
   }
 
-  public AbstractCollectionComboBoxModel(@Nullable T selection, @NotNull Collection<T> items) {
-    super(items);
+  public AbstractCollectionComboBoxModel(@Nullable T selection, @NotNull List<T> items) {
+    super(items, true);
 
     mySelection = selection;
   }
diff --git a/platform/platform-api/src/com/intellij/ui/CollectionListModel.java b/platform/platform-api/src/com/intellij/ui/CollectionListModel.java
index 0b05bc334b59..aa51ac5ff9c1 100644
--- a/platform/platform-api/src/com/intellij/ui/CollectionListModel.java
+++ b/platform/platform-api/src/com/intellij/ui/CollectionListModel.java
@@ -35,8 +35,13 @@ public class CollectionListModel<T> extends AbstractListModel implements Editabl
     myItems = new ArrayList<T>(items);
   }
 
+  @SuppressWarnings("UnusedParameters")
+  protected CollectionListModel(@NotNull List<T> items, boolean useListAsIs) {
+    myItems = items;
+  }
+
   public CollectionListModel(@NotNull final List<? extends T> items) {
-    this((Collection<? extends T>)items);
+    myItems = new ArrayList<T>(items);
   }
 
   public CollectionListModel(final T... items) {