diff --git a/src/server/session.ts b/src/server/session.ts
index faedce0e1af..52d33234636 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -527,6 +527,9 @@ module ts.server {
                                 if (lineText.charAt(i) == " ") {
                                     indentPosition--;
                                 }
+                                else if (lineText.charAt(i) == "\t") {
+                                    indentPosition -= editorOptions.IndentSize;
+                                }
                                 else {
                                     break;
                                 }