diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 1b660e2d9e7..ae574f17a82 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -946,7 +946,7 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext *         aPresContext,
     aDropDownBtn->SetRect(buttonRect);
     SetChildFrameSize(aDropDownBtn, aBtnWidth, aDesiredSize.height);
     aDesiredSize.width = 0;
-    aDesiredSize.height = dispHeight;
+    aDesiredSize.height = dispHeight + aBorderPadding.top + aBorderPadding.bottom;;
     // XXX What about ascent and descent?
     return;
   }
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index 1b660e2d9e7..ae574f17a82 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -946,7 +946,7 @@ nsComboboxControlFrame::ReflowCombobox(nsIPresContext *         aPresContext,
     aDropDownBtn->SetRect(buttonRect);
     SetChildFrameSize(aDropDownBtn, aBtnWidth, aDesiredSize.height);
     aDesiredSize.width = 0;
-    aDesiredSize.height = dispHeight;
+    aDesiredSize.height = dispHeight + aBorderPadding.top + aBorderPadding.bottom;;
     // XXX What about ascent and descent?
     return;
   }