diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index c841b1e7f5..8ad70459c6 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -422,6 +422,11 @@ protected:
 
     void OnPaint( wxPaintEvent& event );
     
+    // Always be focussable, even with child windows
+    virtual void SetCanFocus(bool WXUNUSED(canFocus))
+    {  wxPanel::SetCanFocus(true); }
+    
+
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_ABSTRACT_CLASS(wxPGCanvas)