diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
index 413835ffd48f..a6b0eba7730a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
@@ -133,7 +133,7 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
 
     @Override
     public boolean skipElement(LookupElement element, CompletionLocation location) {
-      return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement)element).sudden;
+      return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement)element).sudden && !Registry.is("ide.completion.autopopup.select.live.templates");
     }
   }
 
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index c2a3376be978..d4075008459a 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -213,6 +213,7 @@ ide.mac.fix.accessibleLeak=true
 projectView.showHierarchyErrors=true
 projectView.hide.dot.idea=true
 show.live.templates.in.completion=false
+ide.completion.autopopup.select.live.templates=false
 documentation.component.editor.font=false
 
 ide.completion.show.better.matching.classes=true