diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
index 3f732cdb19c0..3e106d988f73 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
@@ -223,8 +223,7 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedInternalDo
       }
     }
 
-    Rectangle visibleArea = myEditor.getScrollingModel().getVisibleArea();
-    return visibleArea.width > 0 && visibleArea.height > 0;
+    return !myApplianceManager.getAvailableArea().isEmpty();
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
index d58950cd1e1a..9058aa046b8d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
@@ -1013,6 +1013,11 @@ public class SoftWrapApplianceManager implements Dumpable {
     myPainter = painter;
   }
 
+  public Rectangle getAvailableArea() {
+    Rectangle visibleArea = myEditor.getScrollingModel().getVisibleArea();
+    return new Rectangle(myWidthProvider.getVisibleAreaWidth(), visibleArea.height);
+  }
+
   /**
    * We need to use correct indent for soft-wrapped lines, i.e. they should be indented to the start of the logical line.
    * This class stores information about logical line start indent.