diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c60fcffc49..54cbb0fa17 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5268,7 +5268,16 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 }
                 else
                 {
-                    MoveCursorDown( event.ShiftDown() );
+                    if ( GetGridCursorRow() < GetNumberRows()-1 )
+                    {
+                        MoveCursorDown( event.ShiftDown() );
+                    }
+                    else
+                    {
+                        // at the bottom of a column
+                        HideCellEditControl();
+                        SaveEditControlValue();
+                    }
                 }
                 break;