diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 874499b1e2..b8d8786839 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7864,11 +7864,7 @@ void wxGrid::HideCellEditControl()
         editor->DecRef();
         attr->DecRef();
 
-        // if the focus moved completely outside this application, set it to
-        // ourselves so that it's not "lost" when the user switches back to
-        // this app
-        if ( !FindFocus() )
-            m_gridWin->SetFocus();
+        m_gridWin->SetFocus();
 
         // refresh whole row to the right
         wxRect rect( CellToRect(row, col) );