diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
index 3bc3e90b81b3..bb6e3d510e9a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
@@ -151,6 +151,7 @@ public class SyncScrollSupport implements Disposable {
     Editor slave = sidesContainer.getEditor(masterSide.otherSide());
 
     if (master == null || slave == null) return;
+    if (master.isDisposed() || slave.isDisposed()) return;
 
     int masterVerticalScrollOffset = master.getScrollingModel().getVerticalScrollOffset();
     int slaveVerticalScrollOffset = slave.getScrollingModel().getVerticalScrollOffset();