diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index dace6230a4..7eb5692256 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -219,18 +219,15 @@ void wxVListBoxComboPopup::DismissWithEvent()
 
     int selection = wxVListBox::GetSelection();
 
-    Dismiss();
-
     if ( selection != wxNOT_FOUND )
         m_stringValue = m_strings[selection];
     else
         m_stringValue.clear();
 
-    if ( m_stringValue != m_combo->GetValue() )
-        m_combo->SetValueByUser(m_stringValue);
-
     m_value = selection;
 
+    Dismiss();
+
     SendComboBoxEvent(selection);
 }