diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 45c1d6e8c2dd..6877360652ba 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -1782,7 +1782,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi if (softWrap != null) { softWrapsToSkip.add(softWrap.getStart()); Color color = null; - if (!backColor.equals(defaultBackground)) { + if (backColor != null && !backColor.equals(defaultBackground)) { color = backColor; }