1 files changed, 7 insertions, 1 deletions
diff --git a/src/swing/scala/swing/ComboBox.scala b/src/swing/scala/swing/ComboBox.scala
index 219972d22f..44919f077a 100644
--- a/src/swing/scala/swing/ComboBox.scala
+++ b/src/swing/scala/swing/ComboBox.scala
@@ -115,7 +115,13 @@ object ComboBox {
     new AbstractListModel with ComboBoxModel {
       private var selected = items(0)
       def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
-      def setSelectedItem(a: Any) { selected = a.asInstanceOf[A] }
+      def setSelectedItem(a: Any) {
+        if ((selected != null && selected != a) ||
+            selected == null && a != null) {
+          selected = a.asInstanceOf[A]
+          fireContentsChanged(this, -1, -1)
+        }
+      }
       def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
       def getSize = items.size
     }