diff --git a/lcl/grids.pas b/lcl/grids.pas
index 17ca0bf1ac..ca28c591eb 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -2814,16 +2814,16 @@ end;
 procedure TCustomGrid.EditorGetValue;
 begin
   If Not (csDesigning in ComponentState) Then begin
-    EditorHide;
     doEditorGetValue;
+    EditorHide;
   End;
 end;
 
 procedure TCustomGrid.EditorSetValue;
 begin
   If Not (csDesigning in ComponentState) Then begin
-    EditorPos;
     doEditorSetValue;
+    EditorPos;
   End;
 end;