2 files changed, 4 insertions, 0 deletions
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 935774582c..4fb9185b90 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -1675,6 +1675,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
         if(width > 255*256) throw new IllegalArgumentException("The maximum column width for an individual cell is 255 characters.");
 
         columnHelper.setColWidth(columnIndex, (double)width/256);
+        columnHelper.setCustomWidth(columnIndex, true);
     }
 
     public void setDefaultColumnStyle(int column, CellStyle style) {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index 7bcf9c1cb4..39a1a4d766 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
@@ -695,6 +695,7 @@ public class TestXSSFSheet extends BaseTestSheet {
         assertEquals(2, col.getMin());
         assertEquals(2, col.getMax());
         assertEquals(22.0, col.getWidth(), 0.0);
+        assertTrue(col.getCustomWidth());
 
         // Now set another
         sheet.setColumnWidth(3, 33 * 256);
@@ -708,10 +709,12 @@ public class TestXSSFSheet extends BaseTestSheet {
         assertEquals(2, col.getMin()); // POI 1
         assertEquals(2, col.getMax());
         assertEquals(22.0, col.getWidth(), 0.0);
+        assertTrue(col.getCustomWidth());
 
         col = cols.getColArray(1);
         assertEquals(4, col.getMin()); // POI 3
         assertEquals(4, col.getMax());
         assertEquals(33.0, col.getWidth(), 0.0);
+        assertTrue(col.getCustomWidth());
     }
 }