diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/PatternBasedInjectionHelper.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/PatternBasedInjectionHelper.java
index 9f586594b3a2..82948e872fc8 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/PatternBasedInjectionHelper.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/PatternBasedInjectionHelper.java
@@ -174,7 +174,9 @@ public class PatternBasedInjectionHelper {
       final char ch = curPos++ < text.length()? text.charAt(curPos-1) : 0;
       switch (curFrame.state) {
         case init:
-          if (Character.isJavaIdentifierStart(ch)) {
+          if (Character.isWhitespace(ch)) {
+          }
+          else if (Character.isJavaIdentifierStart(ch)) {
             curString.append(ch);
             curFrame.state = State.name;
           }
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/BaseInjectionPanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/BaseInjectionPanel.java
index 1cee03a0e9be..3ec5f63811e5 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/BaseInjectionPanel.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/BaseInjectionPanel.java
@@ -93,7 +93,7 @@ public class BaseInjectionPanel extends AbstractInjectionPanel<BaseInjection> {
         s = s.substring(1).trim();
       }
       else {
-        sb.append(s);
+        sb.append(s.trim());
         continue;
       }
       if (sb.length() > 0) {