diff --git a/platform/lang-impl/src/com/intellij/formatting/WhiteSpace.java b/platform/lang-impl/src/com/intellij/formatting/WhiteSpace.java
index 2e6b38060911..fff66ab9aea7 100644
--- a/platform/lang-impl/src/com/intellij/formatting/WhiteSpace.java
+++ b/platform/lang-impl/src/com/intellij/formatting/WhiteSpace.java
@@ -181,7 +181,7 @@ class WhiteSpace {
           myIndentSpaces = 0;
           break;
         case '\t':
-          myIndentSpaces += tabSize;
+          myIndentSpaces += tabSize - (mySpaces % tabSize);
           break;
         default: mySpaces++;
       }