diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
index 3888f9f27c32..af39d196db00 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
@@ -148,13 +148,14 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
         return updateIfCurrent(myFilter.myContext.getCurrentConfigurable());
       }
 
-      private Promise<? super Object> updateIfCurrent(Configurable configurable) {
+      @NotNull
+      private Promise<? super Object> updateIfCurrent(@Nullable Configurable configurable) {
         if (configurable != null && configurable == myFilter.myContext.getCurrentConfigurable()) {
           updateStatus(configurable);
           return Promises.resolvedPromise();
         }
         else {
-          return Promises.rejectedPromise("rejected");
+          return Promises.cancelledPromise();
         }
       }
     });