diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
index a3ff50eb594b..76416e74ef56 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
@@ -356,8 +356,8 @@ public class CompletionLookupArranger extends LookupArranger {
           item.getLookupString().equals(selectedText)) {
         return i;
       }
-      if (isTemplate && i < items.size() - 1 && !CompletionServiceImpl.isStartMatch(items.get(i + 1), lookup)) {
-        return i;
+      if (i == 0 && isTemplate && items.size() > 1 && !CompletionServiceImpl.isStartMatch(items.get(1), lookup)) {
+        return 0;
       }
     }