diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ArrayAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ArrayAction.java
index 2488b0c05ef9..3aff296c40bf 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ArrayAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ArrayAction.java
@@ -196,7 +196,7 @@ public abstract class ArrayAction extends DebuggerAction {
 
       public ExpressionDialog(@NotNull Project project, XExpression expression) {
         super(project);
-        myInputComponent = new ExpressionInputComponent(project, new JavaDebuggerEditorsProvider(), "filterExpression", null, expression, null, false);
+        myInputComponent = new ExpressionInputComponent(project, new JavaDebuggerEditorsProvider(), "filterExpression", null, expression, myDisposable, false);
         setTitle("Filter");
         init();
       }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
index c43a761b64c8..19692d299253 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
@@ -60,7 +60,7 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
                                   @Nullable String historyId,
                                   final @Nullable XSourcePosition sourcePosition,
                                   @Nullable XExpression expression,
-                                  Disposable parentDisposable,
+                                  @NotNull Disposable parentDisposable,
                                   boolean showHelp) {
     super(XDebuggerBundle.message("xdebugger.dialog.title.evaluate.expression"));
     //myMainPanel.add(new JLabel(XDebuggerBundle.message("xdebugger.evaluate.label.expression")), BorderLayout.WEST);