diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp
index f56b2c7f18..eab4ac2c97 100644
--- a/common/grid_tricks.cpp
+++ b/common/grid_tricks.cpp
@@ -500,7 +500,7 @@ void GRID_TRICKS::onUpdateUI( wxUpdateUIEvent& event )
             }
         }
 
-        if( !cursorInSelectedRow )
+        if( !cursorInSelectedRow && cursorRow >= 0 )
             m_grid->SelectRow( cursorRow );
     }
 }