diff --git a/tools/lazdatadesktop/datapanel.pp b/tools/lazdatadesktop/datapanel.pp
index 66202e06a7..1e6d6f9c05 100644
--- a/tools/lazdatadesktop/datapanel.pp
+++ b/tools/lazdatadesktop/datapanel.pp
@@ -151,7 +151,9 @@ begin
   FDBgrid:=TDBGrid.Create(Self);
   FDBGrid.Parent:=Self;
   FDBGrid.Align:=alClient;
+  FDBGrid.Options:=FDBGrid.Options+[dgAutoSizeColumns];
   FDBGrid.DataSource:=FDatasource;
+  FDBGrid.AutoSizeColumns;
   // Navigator;
   FNavigator:=TDBNavigator.Create(Self);
   FNavigator.Parent:=FTopPanel;