diff --git a/src/juce_appframework/gui/components/controls/juce_ComboBox.cpp b/src/juce_appframework/gui/components/controls/juce_ComboBox.cpp
index 006060ecc5..0956c1be14 100644
--- a/src/juce_appframework/gui/components/controls/juce_ComboBox.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_ComboBox.cpp
@@ -284,7 +284,7 @@ int ComboBox::getSelectedItemIndex() const throw()
 void ComboBox::setSelectedItemIndex (const int index,
                                      const bool dontSendChangeMessage) throw()
 {
-    if (currentIndex != index)
+    if (currentIndex != index || label->getText() != getItemText (currentIndex))
     {
         if (index >= 0 && index < getNumItems())
             currentIndex = index;