diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 4bd7fd66411..f904cfe744d 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -296,7 +296,12 @@ module ts.formatting {
         }
 
         function getLineIndentationWhenExpressionIsInMultiLine(node: Node, sourceFile: SourceFile, options: EditorOptions): number {
-            if (node.parent && (
+            // actual indentation should not be used when:
+            // - node is close parenthesis - this is the end of the expression
+            // - node is property access expression
+            if (node.kind !== SyntaxKind.CloseParenToken &&
+                node.kind !== SyntaxKind.PropertyAccessExpression &&
+                node.parent && (
                 node.parent.kind === SyntaxKind.CallExpression ||
                 node.parent.kind === SyntaxKind.NewExpression)) {
 
diff --git a/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts b/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts
index ec2ae9b3c22..3692974f5fb 100644
--- a/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts
+++ b/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts
@@ -18,4 +18,4 @@ goTo.marker("1");
 edit.insert("\r\n");
 goTo.marker("0");
 // Won't-fixed: Smart indent during chained function calls
-verify.indentationIs(4);
\ No newline at end of file
+verify.indentationIs(8);
\ No newline at end of file
diff --git a/tests/cases/fourslash/formattingOnChainedCallbacks.ts b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
index 98f91de56fb..b8dbc55d8b6 100644
--- a/tests/cases/fourslash/formattingOnChainedCallbacks.ts
+++ b/tests/cases/fourslash/formattingOnChainedCallbacks.ts
@@ -13,6 +13,14 @@
 ////    })/*b*/
 ////}
 
+////Promise
+////    .then(
+////    /*n1*/
+////        )
+////    /*n2*/
+////    .then();
+
+
 goTo.marker('1');
 edit.insertLine('');
 goTo.marker('2');
@@ -36,4 +44,9 @@ edit.insert(';');
 verify.currentLineContentIs('            "";');
 goTo.marker('b');
 edit.insert(';');
-verify.currentLineContentIs('        });');
\ No newline at end of file
+verify.currentLineContentIs('        });');
+
+goTo.marker('n1');
+verify.indentationIs(8);
+goTo.marker('n2');
+verify.indentationIs(4);
\ No newline at end of file