diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 452db329f1..00eef8c991 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -166,6 +166,10 @@ public:
     // Collapse the entire tree
     virtual void CollapseTree();
 
+
+    // overridden base class methods
+    virtual void SetFocus();
+
 protected:
     virtual void ExpandRoot();
     virtual void ExpandDir(wxTreeItemId parentId);
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 0164ddfc7b..5e35d0ff4c 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -664,6 +664,13 @@ void wxGenericDirCtrl::SetupSections()
         AddSection(paths[n], names[n], icons[n]);
 }
 
+void wxGenericDirCtrl::SetFocus()
+{
+    // we don't need focus ourselves, give it to the tree so that the user
+    // could navigate it
+    m_treeCtrl->SetFocus();
+}
+
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
 {
     // don't rename the main entry "Sections"