diff --git a/lcl/grids.pas b/lcl/grids.pas
index 5d1901d4ab..ca1978203c 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -7670,6 +7670,7 @@ begin
         end;
       end;
     VK_ESCAPE:
+      if (FEditor<>nil) and FEditor.Visible then
       begin
         EditordoResetValue;
         EditorHide;