diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 763042fefd..6b6f76e66d 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -2123,16 +2123,8 @@ bool wxPGProperty::SetChoices( const wxPGChoices& choices )
 
 const wxPGEditor* wxPGProperty::GetEditorClass() const
 {
-    const wxPGEditor* editor;
+    const wxPGEditor* editor = m_customEditor ? m_customEditor : DoGetEditorClass();
 
-    if ( !m_customEditor )
-    {
-        editor = DoGetEditorClass();
-    }
-    else
-        editor = m_customEditor;
-
-    //
     // Maybe override editor if common value specified
     if ( GetDisplayedCommonValueCount() )
     {