diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
index b07b60b21626..59e2397e5b6e 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
@@ -173,11 +173,13 @@ public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Dispo
 
     createPredefinedScopeDescriptors(model);
 
-    model.addElement(new ScopeSeparator("VCS Scopes"));
     final List<NamedScope> changeLists = ChangeListsScopesProvider.getInstance(myProject).getCustomScopes();
-    for (NamedScope changeListScope : changeLists) {
-      final GlobalSearchScope scope = GlobalSearchScopesCore.filterScope(myProject, changeListScope);
-      model.addElement(new ScopeDescriptor(scope));
+    if (!changeLists.isEmpty()) {
+      model.addElement(new ScopeSeparator("VCS Scopes"));
+      for (NamedScope changeListScope : changeLists) {
+        final GlobalSearchScope scope = GlobalSearchScopesCore.filterScope(myProject, changeListScope);
+        model.addElement(new ScopeDescriptor(scope));
+      }
     }
 
     final List<ScopeDescriptor> customScopes = new ArrayList<ScopeDescriptor>();