diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/SetValueAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/SetValueAction.java
index 8adff3f3a6ff..b8de9e654fd6 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/SetValueAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/SetValueAction.java
@@ -374,6 +374,10 @@ public class SetValueAction extends DebuggerAction {
       }
 
       private void flushValue() {
+        if (comboBox.isPopupVisible()) {
+          comboBox.selectPopupValue();
+        }
+
         Editor editor = getEditor();
         if(editor == null) {
           return;