diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index ab04438c63..0a21394f12 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -1433,6 +1433,7 @@ begin
   if UpdateGridCounts=0 then
     EmptyGrid;
   UpdateScrollBarRange;
+  RestoreEditor;
   {$ifdef dbgDBGrid} DebugLn('doLayoutChanged FIN'); {$endif}
 end;
 {