diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 4fbe07fb69..19359643e7 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5563,10 +5563,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_HOME:
+                if ( m_currentCellCoords != wxGridNoCellCoords )
                 {
-                    if ( m_currentCellCoords == wxGridNoCellCoords )
-                        break;
-
                     const bool useSelectedBlockCorner =
                         event.ShiftDown() && m_selectedBlockCorner != wxGridNoCellCoords;
                     int row = useSelectedBlockCorner ? m_selectedBlockCorner.GetRow()
@@ -5606,10 +5604,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_END:
+                if ( m_currentCellCoords != wxGridNoCellCoords )
                 {
-                    if ( m_currentCellCoords == wxGridNoCellCoords )
-                        break;
-
                     const bool useSelectedBlockCorner =
                         event.ShiftDown() && m_selectedBlockCorner != wxGridNoCellCoords;
                     int row = useSelectedBlockCorner ? m_selectedBlockCorner.GetRow()