diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp
index 990b1a6fd4..4eaaea10a7 100644
--- a/common/grid_tricks.cpp
+++ b/common/grid_tricks.cpp
@@ -456,6 +456,7 @@ void GRID_TRICKS::onCharHook( wxKeyEvent& ev )
     bool handled = false;
 
     if( ( ev.GetKeyCode() == WXK_RETURN || ev.GetKeyCode() == WXK_NUMPAD_ENTER )
+        && ev.GetModifiers() == wxMOD_NONE
         && m_grid->GetGridCursorRow() == m_grid->GetNumberRows() - 1 )
     {
         if( m_grid->IsCellEditControlShown() )