diff --git a/lcl/grids.pas b/lcl/grids.pas
index 1d1ed4bfb9..669d22d648 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -7316,6 +7316,7 @@ begin
     and Editor.Visible then
   begin
     FEditorMode:=False;
+    FGridState := gsNormal;
     {$ifdef dbgGrid}DebugLn('EditorHide [',Editor.ClassName,'] INIT FCol=',IntToStr(FCol),' FRow=',IntToStr(FRow));{$endif}
     LockEditor;
     try