diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c00a030efb..125b859ebe 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5301,7 +5301,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 else
                 {
-                    if ( GetGridCursorCol() > 0 )
+                    if ( GetGridCursorCol() < GetNumberCols()-1 )
                     {
                         MoveCursorRight( FALSE );
                     }