diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java
index 8ea6c89fda58..fa1aee817e20 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java
@@ -480,7 +480,7 @@ public class LineStatusTrackerDrawing {
   }
 
   private static class PopupPanel extends JPanel {
-    private final JComponent myEditorComponent;
+    @Nullable private final JComponent myEditorComponent;
 
     public PopupPanel(@NotNull final Editor editor,
                       @NotNull ActionToolbar toolbar,
@@ -548,7 +548,7 @@ public class LineStatusTrackerDrawing {
     }
 
     public int getEditorTextOffset() {
-      return myEditorComponent.getInsets().left;
+      return 3; // myEditorComponent.getInsets().left
     }
   }
 }