diff --git a/lcl/grids.pas b/lcl/grids.pas
index 10435d873c..1f5c317899 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -6299,8 +6299,8 @@ function TCustomGrid.EditingAllowed(ACol: Integer = -1): Boolean;
 var
   C: TGridColumn;
 begin
-  Result:=(goEditing in options);
-  if Result and (ACol>=0) and (ACol<ColCount) then begin
+  Result:=(goEditing in options) and (ACol>=0) and (ACol<ColCount);
+  if Result and Columns.Enabled then begin
     C:=ColumnFromGridColumn(ACol);
     Result:=(C<>nil) and (not C.ReadOnly);
   end;