diff --git a/ClosedXML/Excel/Columns/XLColumn.cs b/ClosedXML/Excel/Columns/XLColumn.cs
index b0278ed..ef07489 100644
--- a/ClosedXML/Excel/Columns/XLColumn.cs
+++ b/ClosedXML/Excel/Columns/XLColumn.cs
@@ -300,9 +300,15 @@
             var fontCache = new Dictionary<IXLFontBase, Font>();
             Double colMaxWidth = minWidth;
 
-            Int32 autoFilterRow = 0;
+            List<Int32> autoFilterRows = new List<Int32>();
             if (this.Worksheet.AutoFilter != null && this.Worksheet.AutoFilter.Range != null)
-                autoFilterRow = this.Worksheet.AutoFilter.Range.FirstRow().RowNumber();
+                autoFilterRows.Add(this.Worksheet.AutoFilter.Range.FirstRow().RowNumber());
+
+            autoFilterRows.AddRange(Worksheet.Tables.Where(t => 
+                    t.AutoFilter != null 
+                    && t.AutoFilter.Range != null 
+                    && !autoFilterRows.Contains(t.AutoFilter.Range.FirstRow().RowNumber()))
+                .Select(t => t.AutoFilter.Range.FirstRow().RowNumber()));
 
             foreach (XLCell c in Column(startRow, endRow).CellsUsed())
             {
@@ -447,7 +453,7 @@
                 else
                     thisWidthMax = c.Style.Font.GetWidth(c.GetFormattedString(), fontCache);
 
-                if (autoFilterRow == c.Address.RowNumber)
+                if (autoFilterRows.Contains(c.Address.RowNumber))
                     thisWidthMax += 2.7148; // Allow room for arrow icon in autofilter
 
 
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
index 8fd67be..1c3d359 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataSet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
index 53d5ab2..21de466 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/AddingDataTableAsWorksheet.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
index 23582c4..027c1a7 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
index 29317a1..80c7c3d 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/InsertingTables.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
index a9f74c5..a9d4499 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/ShowCase.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx b/ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
index d28109f..2908ead 100644
--- a/ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx b/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
index 50cd14f..6e89783 100644
--- a/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Ranges/UsingTables.xlsx
Binary files differ