diff --git a/docs/contributors.utf8 b/docs/contributors.utf8
index d670e1a476..9d1a8eca2e 100644
--- a/docs/contributors.utf8
+++ b/docs/contributors.utf8
@@ -10,6 +10,7 @@ Antônio Galvão
 Bogusław Brandys
 Daniel Simões de Almeida
 Diogo Piçarra
+Éderson Cássio
 Flávio Etrusco
 Jörg Braun
 Juan Salvador Pérez García
diff --git a/lcl/grids.pas b/lcl/grids.pas
index de8ee577ae..c8f33b162e 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -8801,7 +8801,12 @@ begin
       end;
     end;
   end;
-  inherited SetFocus;
+
+  if (Editor <> nil) and (Editor.Visible) then
+     Editor.SetFocus
+  else
+     inherited SetFocus;
+
   {$IFDEF dbgGrid}
   DebugLnExit('TCustomGrid.SetFocus END');
   {$ENDIF}