diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index 095a82e761..781e5b91f0 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -495,7 +495,8 @@ type
     property OnUserCheckboxState: TDbGridCheckboxStateEvent read FOnCheckboxState write FOnCheckboxState;
   public
     constructor Create(AOwner: TComponent); override;
-    procedure AutoSizeColumns;
+    procedure AutoAdjustColumns; override;
+    procedure AutoSizeColumns; deprecated 'This method will be deleted in 1.8. Use AutoAdjustColumns';
     procedure InitiateAction; override;
     procedure DefaultDrawColumnCell(const Rect: TRect; DataCol: Integer; Column: TColumn; State: TGridDrawState);
     function  EditorByStyle(Style: TColumnButtonStyle): TWinControl; override;
@@ -3496,10 +3497,15 @@ begin
   AllowOutboundEvents := false;
 end;
 
+procedure TCustomDBGrid.AutoAdjustColumns;
+begin
+  Exclude(FGridStatus, gsAutoSized);
+  UpdateAutoSizeColumns;
+end;
+
 procedure TCustomDBGrid.AutoSizeColumns;
 begin
-  RenewColWidths;
-  LayoutChanged;
+  AutoAdjustColumns;
 end;
 
 procedure TCustomDBGrid.InitiateAction;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index af00caac5d..8f64fe7d9a 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -1204,7 +1204,7 @@ type
 
     { Exposed procs }
     procedure AdjustInnerCellRect(var ARect: TRect);
-    procedure AutoAdjustColumns;
+    procedure AutoAdjustColumns; virtual;
     procedure BeginUpdate;
     function  CellRect(ACol, ARow: Integer): TRect;
     function  CellToGridZone(aCol,aRow: Integer): TGridZone;