diff --git a/docs/changes.txt b/docs/changes.txt
index 4810012c3f..5dde0cbb30 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -122,6 +122,10 @@ wxGTK:
 - Fix wxNO_BORDER style for wxRadioBox (David Hart)
 - Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
 
+wxMac:
+
+- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord)
+
 wxUniv:
 
 - Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen)
diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 6a155d9636..bf360cb425 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -576,7 +576,7 @@ void wxComboBox::SetSelection(int n)
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
-        m_text->SetValue(GetString(n));
+        m_text->SetValue(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString));
 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const