aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 345bdc0cbb..d9eac91e2b 100644
--- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -252,8 +252,11 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
getWidget().setPromptingOn();
} else {
// we have focus in field, prompting can't be set on, instead
- // just clear the input
- getWidget().tb.setValue("");
+ // just clear the input if the value has changed from something
+ // else to null
+ if (getWidget().selectedOptionKey != null) {
+ getWidget().tb.setValue("");
+ }
}
getWidget().setSelectedItemIcon(null);
getWidget().selectedOptionKey = null;