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 70d741d5351f..8638cd9a7ad5 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
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.template.impl;
 
 import com.intellij.codeInsight.completion.*;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.ProcessingContext;
@@ -42,6 +43,13 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
 
         final PsiFile file = parameters.getOriginalFile();
         final int offset = parameters.getOffset();
+        if (Registry.is("show.live.templates.in.completion")) {
+          for (final TemplateImpl possible : listApplicableTemplates(file, offset)) {
+            result.addElement(new LiveTemplateLookupElement(possible.getKey(), possible));
+          }
+          return;
+        }
+
         final String prefix = result.getPrefixMatcher().getPrefix();
         final TemplateImpl template = findApplicableTemplate(file, offset, prefix);
         if (template != null) {
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 2552ad9c8f01..0cb49983565e 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -131,3 +131,4 @@ jvmbugfix.mac.caccessibleLeak=true
 projectView.showHierarchyErrors=false
 dir.diff.default.src.folder=
 dir.diff.default.trg.folder=
+show.live.templates.in.completion=false