diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index acb4ef1536..c6d697681a 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -1984,7 +1984,7 @@ void wxPGProperty::SetChoiceSelection( int newValue )
     }
     else  // if ( valueType == wxPG_VARIANT_TYPE_LONG )
     {
-        SetValue( (long) newValue );
+        SetValue( m_choices.GetValue(newValue) );
     }
 }