diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
index b3ce5963bc88..e09cd69da76a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
@@ -308,6 +308,12 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
 
   @Override
   public void dispose() {
+
+    final MyErrorPanel panel = getErrorPanel();
+    if (panel != null) {
+      panel.uninstallListeners();
+    }
+
     if (myErrorStripeRenderer instanceof Disposable)  {
       Disposer.dispose((Disposable)myErrorStripeRenderer);
     }