diff --git a/lcl/grids.pas b/lcl/grids.pas
index 87299a00a7..713cfb2da1 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -12206,6 +12206,8 @@ begin
 
     VK_END, VK_HOME:
       ;
+    VK_ESCAPE:
+      FGrid.EditorHide;
     else
       doEditorKeyDown;
   end;