diff --git a/src/services/smartSelection.ts b/src/services/smartSelection.ts
index 0a2adcd9507..68ead8029fd 100644
--- a/src/services/smartSelection.ts
+++ b/src/services/smartSelection.ts
@@ -26,7 +26,7 @@ namespace ts.SmartSelectionRange {
                     //
                     // Dive in without pushing a selection range.
                     if (isBlock(node)
-                        || isTemplateSpan(node) || isTemplateHead(node)
+                        || isTemplateSpan(node) || isTemplateHead(node) || isTemplateTail(node)
                         || prevNode && isTemplateHead(prevNode)
                         || isVariableDeclarationList(node) && isVariableStatement(parentNode)
                         || isSyntaxList(node) && isVariableDeclarationList(parentNode)
diff --git a/tests/baselines/reference/smartSelection_templateStrings2.baseline b/tests/baselines/reference/smartSelection_templateStrings2.baseline
new file mode 100644
index 00000000000..cb49f567cb6
--- /dev/null
+++ b/tests/baselines/reference/smartSelection_templateStrings2.baseline
@@ -0,0 +1,4 @@
+`a ${b} /**/c`
+
+ a ${b} c 
+`a ${b} c`
\ No newline at end of file
diff --git a/tests/cases/fourslash/smartSelection_templateStrings2.ts b/tests/cases/fourslash/smartSelection_templateStrings2.ts
new file mode 100644
index 00000000000..dd13ffe11ab
--- /dev/null
+++ b/tests/cases/fourslash/smartSelection_templateStrings2.ts
@@ -0,0 +1,5 @@
+/// <reference path="fourslash.ts" />
+
+////`a ${b} /**/c`
+
+verify.baselineSmartSelection();