diff --git a/src/widgets/wxPanelWrapper.cpp b/src/widgets/wxPanelWrapper.cpp
index 162c37658..d4bee55bf 100644
--- a/src/widgets/wxPanelWrapper.cpp
+++ b/src/widgets/wxPanelWrapper.cpp
@@ -17,7 +17,8 @@ void wxTabTraversalWrapperCharHook(wxKeyEvent &event)
    // due to the switch to wxWidgets 3.0.2
    if (event.GetKeyCode() == WXK_TAB) {
       auto focus = wxWindow::FindFocus();
-      if (dynamic_cast<wxGrid*>(focus)) {
+      if (dynamic_cast<wxGrid*>(focus)
+         || (focus && dynamic_cast<wxGrid*>(focus->GetParent()->GetParent()))) {
          // Let wxGrid do its own TAB key handling
          event.Skip();
          return;