diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 0d3a57eb35..831c669c75 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4748,11 +4748,12 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 // Otherwise fall through to default
 
             default:
-                // alphanumeric keys enable the cell edit control
+                // alphanumeric keys or F2 (special key just for this) enable
+                // the cell edit control
                 if ( !(event.AltDown() ||
                        event.MetaDown() ||
                        event.ControlDown()) &&
-                     isalnum(event.KeyCode()) &&
+                     (isalnum(event.KeyCode()) || event.KeyCode() == WXK_F2) &&
                      !IsCellEditControlEnabled() &&
                      CanEnableCellControl() )
                 {