diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index de22c22662..0aada2d7d5 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3327,9 +3327,6 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
 
     m_pState->m_anyModified = 1;
 
-    // If property's value is being changed, assume it is valid
-    OnValidationFailureReset(selected);
-
     // Maybe need to update control
     wxASSERT( m_chgInfo_changedProperty != NULL );
 
@@ -3337,6 +3334,9 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
     wxPGProperty* changedProperty = m_chgInfo_changedProperty;
     wxVariant value = m_chgInfo_pendingValue;
 
+    // If property's value is being changed, assume it is valid
+    OnValidationFailureReset(selected);
+
     wxPGProperty* topPaintedProperty = changedProperty;
 
     while ( !topPaintedProperty->IsCategory() &&