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 ed9fbc348937..6de987b26205 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 @@ -113,7 +113,7 @@ public class LookupManagerImpl extends LookupManager { } LookupImpl lookup = createLookup(editor, items, prefix, arranger); - return lookup.showLookup() ? lookup : null; + return lookup != null && lookup.showLookup() ? lookup : null; } public LookupImpl createLookup(final Editor editor,