diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index 42867bdbf181..e59d91e769ed 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -397,6 +397,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
     LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread());
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       public void run() {
+        if (myDisposed) return;
         myConfigurable2Content.put(configurable, content);
         result.setDone();
       }