diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index b00514c94f..ff41b53a37 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -444,7 +444,7 @@ void wxListBox::MacHandleSelectionChange(int row)
         if ( !m_oldSelections.empty() )
         {
             const int oldsel = m_oldSelections[0];
-            if (oldsel >= 0)
+            if ( oldsel >= 0 && oldsel < count )
                 SetSelection(oldsel);
         }
     }