diff --git a/lcl/grids.pas b/lcl/grids.pas
index 1e63aa5fa8..9013b0eb0b 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -5119,10 +5119,10 @@ end;
 function TCustomGrid.GetEditorBorderStyle: TBorderStyle;
 begin
   result := bsSingle;
-  if FEditor = FstringEditor then
+  if FEditor = FStringEditor then
     Result := FStringEditor.BorderStyle
   else if FEditor = FPickListEditor then
-    Result := FStringEditor.BorderStyle;
+    Result := FPickListEditor.BorderStyle;
 end;
 
 function TCustomGrid.GetBorderWidth: Integer;