diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java b/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java
index 475ec7aa4277..b5bb7e3c7a52 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java
@@ -181,6 +181,14 @@ public class ValueHint extends AbstractValueHint {
                         final DebuggerContextImpl debuggerContext,
                         final String title,
                         final AbstractValueHintTreeComponent<?> component) {
+    final AnAction setValueAction = ActionManager.getInstance().getAction(DebuggerActions.SET_VALUE);
+    setValueAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0)), tree);
+    Disposer.register(tree, new Disposable() {
+      @Override
+      public void dispose() {
+        setValueAction.unregisterCustomShortcutSet(tree);
+      }
+    });
     DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
       @Override
       public void run() {
@@ -217,15 +225,6 @@ public class ValueHint extends AbstractValueHint {
                                   }
                                 });
 
-                                final AnAction setValueAction  = ActionManager.getInstance().getAction(DebuggerActions.SET_VALUE);
-                                setValueAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0)), tree);
-                                Disposer.register(tree, new Disposable() {
-                                  @Override
-                                  public void dispose() {
-                                    setValueAction.unregisterCustomShortcutSet(tree);
-                                  }
-                                });
-
                                 showTreePopup(tree, debuggerContext, expressionText,
                                               new ValueHintTreeComponent(ValueHint.this, tree, expressionText));
                               }