1 files changed, 7 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index 4af93113f9..033ec3cd14 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -288,6 +288,13 @@ public class ComboBox extends AbstractSelect implements
 
             // Paint variables
             target.addVariable(this, "selected", selectedKeys);
+            if (getValue() != null && selectedKeys[0] == null) {
+                // not always available, e.g. scrollToSelectedIndex=false
+                // Give the caption for selected item still, not to make it look
+                // like there is no selection at all
+                target.addAttribute("selectedCaption",
+                        getItemCaption(getValue()));
+            }
             if (isNewItemsAllowed()) {
                 target.addVariable(this, "newitem", "");
             }