diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs
index f1842d6..fa3dce7 100644
--- a/ExportDXF/Forms/MainForm.cs
+++ b/ExportDXF/Forms/MainForm.cs
@@ -611,7 +611,16 @@ namespace ExportDXF.Forms
                     col++;
                 }
 
-                partsSheet.Column(2).AutoFit();
+                for (int i = 1; i <= 9; i++)
+                {
+                    var column = partsSheet.Column(i);
+
+                    if (column.Style.WrapText)
+                        continue;
+
+                    column.AutoFit();
+                    column.Width += 1;
+                }
 
                 workbook.Calculate();
                 pkg.Save();
diff --git a/ExportDXF/Templates/BomTemplate.xlsx b/ExportDXF/Templates/BomTemplate.xlsx
index b7e4c8c..553b81d 100644
Binary files a/ExportDXF/Templates/BomTemplate.xlsx and b/ExportDXF/Templates/BomTemplate.xlsx differ