diff --git a/docs/changes.txt b/docs/changes.txt
index 7b7928a71d..17f4575489 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -18,6 +18,7 @@ All (GUI):
 - XRC handler for wxAuiToolBar added (Kinaou Hervé).
 - Add wxHtmlWindow::SetDefaultHTMLCursor() (Jeff A. Marr).
 - Add default ctor and Create() to wxContextHelpButton (Hanmac).
+- Send events when toggling wxPropertyGrid nodes from keyboard (Armel Asselin).
 
 wxGTK:
 
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index f6aeee9aa2..4a1009a90c 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -5659,12 +5659,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
         {
             if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY )
             {
-                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) )
+                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoCollapse(p, true) )
                     wasHandled = true;
             }
             else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY )
             {
-                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) )
+                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoExpand(p, true) )
                     wasHandled = true;
             }
         }