diff --git a/source/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java b/source/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
index 25c07a2e7886..39fc147d0477 100644
--- a/source/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
+++ b/source/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
@@ -70,8 +70,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler{
     while(true){
       if (start == 0) break;
       char c = chars.charAt(start - 1);
-      if (Character.isWhitespace(c)) break;
-      //if (!Character.isJavaIdentifierPart(c)) break;
+      if (!Character.isJavaIdentifierPart(c)) break;
       start--;
     }
     return chars.subSequence(start, offset).toString();