diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
index 914df8b14a83..5ec0450b8db7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java
@@ -63,6 +63,7 @@ class DebuggerSteppingConfigurable implements ConfigurableUi<DebuggerSettings> {
 
   @Override
   public void apply(@NotNull DebuggerSettings settings) {
+    mySteppingFilterEditor.stopEditing();
     getSettingsTo(settings);
   }
 
@@ -83,7 +84,6 @@ class DebuggerSteppingConfigurable implements ConfigurableUi<DebuggerSettings> {
       settings.EVALUATE_FINALLY_ON_POP_FRAME = DebuggerSettings.EVALUATE_FINALLY_ASK;
     }
 
-    mySteppingFilterEditor.stopEditing();
     settings.setSteppingFilters(mySteppingFilterEditor.getFilters());
   }