diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
index 0f666f6ffd27..199c9c4ad894 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
@@ -140,7 +140,7 @@ public class LookupManagerImpl extends LookupManager {
       if (myActiveLookup != lookup) return;
 
       LookupElement currentItem = lookup.getCurrentItem();
-      if (currentItem != null && currentItem.isValid()) {
+      if (currentItem != null && currentItem.isValid() && isAutoPopupJavadocSupportedBy(currentItem)) {
         final CompletionProcess completion = CompletionService.getCompletionService().getCurrentCompletion();
         if (completion != null && !completion.isAutopopupCompletion()) {
           try {
@@ -208,6 +208,10 @@ public class LookupManagerImpl extends LookupManager {
     return lookup;
   }
 
+  protected boolean isAutoPopupJavadocSupportedBy(LookupElement lookupItem) {
+    return true;
+  }
+
   @NotNull
   protected LookupImpl createLookup(@NotNull Editor editor, @NotNull LookupArranger arranger, Project project) {
     return new LookupImpl(project, editor, arranger);