diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 426bd732882..8b7dea13ead 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -295,8 +295,8 @@ module ts.SignatureHelp {
                 var tagExpression = <TaggedTemplateExpression>templateExpression.parent;
                 Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
 
-                // If we're just after a template tail, don't show signature help.
-                if (node.kind === SyntaxKind.TemplateTail && position >= node.getEnd() && !(<LiteralExpression>node).isUnterminated) {
+                // If we're just after a template tail, don't show signature help.
+                if (node.kind === SyntaxKind.TemplateTail && !isInsideTemplateLiteral(<LiteralExpression>node, position)) {
                     return undefined;
                 }
 
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts
new file mode 100644
index 00000000000..e7a5078dcd0
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd${0 + 1}abcd{1 + 1}`/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts
new file mode 100644
index 00000000000..c84b92fee4f
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd${0 + 1}abcd{1 + 1}abcd`/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts
new file mode 100644
index 00000000000..338a8dc65ca
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/``/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts
new file mode 100644
index 00000000000..02383df9267
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd`/*4*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
\ No newline at end of file