diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt
index b037e6ce543..8eb159de291 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt
@@ -32,7 +32,7 @@ public class KotlinWordSelectionFilter : Condition<PsiElement>{
         if (e.getParent().getFirstChild().getNextSibling() == null && e.getParent() !is JetContainerNode) return false // skip nodes with the same range as their parent
 
         return when (e.getNode().getElementType()) {
-            BLOCK, LITERAL_STRING_TEMPLATE_ENTRY, KDocElementTypes.KDOC_SECTION -> false
+            BLOCK, KDocElementTypes.KDOC_SECTION -> false
             else -> true
         }
     }
diff --git a/idea/testData/wordSelection/SimpleStringLiteral2/0.kt b/idea/testData/wordSelection/SimpleStringLiteral2/0.kt
new file mode 100644
index 00000000000..731827167ee
--- /dev/null
+++ b/idea/testData/wordSelection/SimpleStringLiteral2/0.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("<caret>foo bar")
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleStringLiteral2/1.kt b/idea/testData/wordSelection/SimpleStringLiteral2/1.kt
new file mode 100644
index 00000000000..4029187b3c3
--- /dev/null
+++ b/idea/testData/wordSelection/SimpleStringLiteral2/1.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("<selection><caret>foo</selection> bar")
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleStringLiteral2/2.kt b/idea/testData/wordSelection/SimpleStringLiteral2/2.kt
new file mode 100644
index 00000000000..662c11744a0
--- /dev/null
+++ b/idea/testData/wordSelection/SimpleStringLiteral2/2.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("<selection><caret>foo bar</selection>")
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleStringLiteral2/3.kt b/idea/testData/wordSelection/SimpleStringLiteral2/3.kt
new file mode 100644
index 00000000000..995eb53aa3b
--- /dev/null
+++ b/idea/testData/wordSelection/SimpleStringLiteral2/3.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println(<selection>"<caret>foo bar"</selection>)
+}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/TemplateStringLiteral1/2.kt b/idea/testData/wordSelection/TemplateStringLiteral1/2.kt
index 604b04f1c50..844f2767bb6 100644
--- a/idea/testData/wordSelection/TemplateStringLiteral1/2.kt
+++ b/idea/testData/wordSelection/TemplateStringLiteral1/2.kt
@@ -1 +1 @@
-val v = "<selection>aaa $x <caret>bbb</selection>"
\ No newline at end of file
+val v = "aaa $x<selection> <caret>bbb</selection>"
\ No newline at end of file
diff --git a/idea/testData/wordSelection/TemplateStringLiteral1/3.kt b/idea/testData/wordSelection/TemplateStringLiteral1/3.kt
index 1c349f7fcc9..604b04f1c50 100644
--- a/idea/testData/wordSelection/TemplateStringLiteral1/3.kt
+++ b/idea/testData/wordSelection/TemplateStringLiteral1/3.kt
@@ -1 +1 @@
-val v = <selection>"aaa $x <caret>bbb"</selection>
\ No newline at end of file
+val v = "<selection>aaa $x <caret>bbb</selection>"
\ No newline at end of file
diff --git a/idea/testData/wordSelection/TemplateStringLiteral1/4.kt b/idea/testData/wordSelection/TemplateStringLiteral1/4.kt
new file mode 100644
index 00000000000..1c349f7fcc9
--- /dev/null
+++ b/idea/testData/wordSelection/TemplateStringLiteral1/4.kt
@@ -0,0 +1 @@
+val v = <selection>"aaa $x <caret>bbb"</selection>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java
index fdc0c071a51..bffc670075f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java
@@ -50,6 +50,7 @@ public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase {
     public void testCommentForStatements() { doTest(); }
 
     public void testSimpleStringLiteral() { doTest(); }
+    public void testSimpleStringLiteral2() { doTest(); }
 
     public void testTemplateStringLiteral1() { doTest(); }
     public void testTemplateStringLiteral2() { doTest(); }