diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 04cb4d99f2..dc75e9b1e8 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -1819,6 +1819,12 @@ protected:
                     wxVariant* pValue = NULL,
                     unsigned int selFlags = 0 );
 
+    void SetFocusOnCanvas()
+    {
+        m_canvas->SetFocusIgnoringChildren();
+        m_editorFocused = 0;
+    }
+
     bool DoHideProperty( wxPGProperty* p, bool hide, int flags );
 
 private:
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 2229e3feae..11ef4ae1b9 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3594,8 +3594,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
                 }
                 else
                 {
-                    canvas->SetFocusIgnoringChildren();
-                    m_editorFocused = 0;
+                    SetFocusOnCanvas();
                 }
             }
 
@@ -3813,8 +3812,8 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
             }
             else
             {
-                // wxGTK atleast seems to need this (wxMSW not)
-                canvas->SetFocusIgnoringChildren();
+                // Make sure focus is in grid canvas (important for wxGTK, at least)
+                SetFocusOnCanvas();
             }
 
             EditorsValueWasNotModified();
@@ -3836,8 +3835,8 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
         }
         else
         {
-            // Make sure focus is in grid
-            canvas->SetFocusIgnoringChildren();
+            // Make sure focus is in grid canvas
+            SetFocusOnCanvas();
         }
 
         ClearInternalFlag(wxPG_FL_IN_SELECT_PROPERTY);
@@ -3906,7 +3905,7 @@ bool wxPropertyGrid::UnfocusEditor()
     if ( !CommitChangesFromEditor(0) )
         return false;
 
-    m_canvas->SetFocusIgnoringChildren();
+    SetFocusOnCanvas();
     DrawItem(m_selected);
 
     return true;
@@ -4227,7 +4226,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
     // Need to set focus?
     if ( !(m_iFlags & wxPG_FL_FOCUSED) )
     {
-        m_canvas->SetFocusIgnoringChildren();
+        SetFocusOnCanvas();
     }
 
     wxPropertyGridPageState* state = m_pState;