diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/LiveTemplateOrdering.java b/java/java-tests/testData/codeInsight/completion/normalSorting/LiveTemplateOrdering.java
new file mode 100644
index 000000000000..152c336a09c5
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normalSorting/LiveTemplateOrdering.java
@@ -0,0 +1,5 @@
+class Foo {
+  public int main() {
+    r<caret>
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
index b472f87f9c8d..5334efaf0893 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
@@ -22,6 +22,7 @@ import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementPresentation
 import com.intellij.codeInsight.lookup.impl.LookupImpl
+import com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor
 import com.intellij.ide.ui.UISettings
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiField
@@ -670,4 +671,10 @@ interface TxANotAnno {}
     assertPreferredItems 0, 'get'
   }
 
+  public void testLiveTemplateOrdering() {
+    LiveTemplateCompletionContributor.setShowTemplatesInTests(true, getTestRootDisposable())
+    checkPreferredItems(0, 'return')
+    assert lookup.items[-1].lookupString == 'ritar'
+  }
+
 }
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 0514a1f8df1a..6c9a8a083615 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
@@ -91,7 +91,9 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
             @Override
             public void consume(CompletionResult completionResult) {
               finalResult.passResult(completionResult);
-              ensureTemplatesShown(templatesShown, templates, parameters, finalResult);
+              if (completionResult.isStartMatch()) {
+                ensureTemplatesShown(templatesShown, templates, parameters, finalResult);
+              }
             }
           });