diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 2b3646f066..add734ecc1 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3586,7 +3586,7 @@ bool wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
 
     //
     // Try common button handling
-    if ( m_wndEditor2 && event.GetEventType() == wxEVT_BUTTON )
+    if ( IsMainButtonEvent(event) )
     {
         wxPGEditorDialogAdapter* adapter = selected->GetEditorDialog();