diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
index 350df2930ec0..af54994b6ed4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
@@ -362,10 +362,10 @@ public final class EditorUtil {
     if (tabSize <= 0) {
       return x + plainSpaceWidth;
     }
-    tabSize *= plainSpaceWidth;
+    float tabSizePixels = tabSize * plainSpaceWidth;
 
-    int nTabs = (int) (x / tabSize);
-    return (nTabs + 1) * tabSize;
+    int nTabs = (int) ((x + plainSpaceWidth / 2) / tabSizePixels);
+    return (nTabs + 1) * tabSizePixels;
   }
 
   public static int textWidthInColumns(@NotNull Editor editor, @NotNull CharSequence text, int start, int end, int x) {