diff --git a/lcl/grids.pas b/lcl/grids.pas
index 79649e92e0..fc1f05fb2c 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -6625,11 +6625,11 @@ begin
       if not FEditorKey and EditingAllowed(FCol)
       and (Editor is TCustomEdit) and not (csDesigning in ComponentState)
       then begin
-        EditorShow(True);
+        EditorShow(False);
         TCustomEdit(Editor).Text:='';
-        ResetEditor;
         InvalidateCell(FCol,FRow,True);
-        SelectCell(FCol,FRow);      // This does not really select the cell. Why?
+        EditorShow(True);
+        Key := 0;
       end;
   end;
   if FEditorKey then