diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListCompletionContributor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListCompletionContributor.java
index 8b39e8e92332..9e14110b17f8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListCompletionContributor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListCompletionContributor.java
@@ -47,7 +47,9 @@ public class ChangeListCompletionContributor extends CompletionContributor imple
 
   @Override
   public boolean invokeAutoPopup(@NotNull PsiElement position, char typeChar) {
-    return true;
+    PsiFile file = position.getContainingFile();
+    Document cachedDocument = PsiDocumentManager.getInstance(file.getProject()).getCachedDocument(file);
+    return cachedDocument != null && cachedDocument.getUserData(COMBO_BOX_KEY) != null;
   }
 }