diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 6ebf2e29db..48d0487cde 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3594,7 +3594,7 @@ void wxDataViewMainWindow::OnCharHook(wxKeyEvent& event)
     }
     else if ( m_useCellFocus )
     {
-        if ( event.GetKeyCode() == WXK_TAB )
+        if ( event.GetKeyCode() == WXK_TAB && !event.HasModifiers() )
         {
             if ( event.ShiftDown() )
                 OnLeftKey(event);