diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
index 18a0350cc34..4dfd6f66a4f 100644
--- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
@@ -369,6 +369,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
       }
     } // end rowIndex for loop
 
+    // adjust the "fixed" width for content that is too wide
+    if (minColWidth>specifiedFixedColWidth)
+      specifiedFixedColWidth=minColWidth;
     // do all the global bookkeeping, factoring in margins
     nscoord colInset = mTableFrame->GetCellSpacing();
     // keep a running total of the amount of space taken up by all fixed-width columns
diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
index 18a0350cc34..4dfd6f66a4f 100644
--- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
@@ -369,6 +369,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
       }
     } // end rowIndex for loop
 
+    // adjust the "fixed" width for content that is too wide
+    if (minColWidth>specifiedFixedColWidth)
+      specifiedFixedColWidth=minColWidth;
     // do all the global bookkeeping, factoring in margins
     nscoord colInset = mTableFrame->GetCellSpacing();
     // keep a running total of the amount of space taken up by all fixed-width columns