diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index c65d71b1379..5442cb1ad50 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -1927,8 +1927,9 @@ nsGenericElement::GetScrollFrame(nsIFrame **aStyledFrame)
}
// menu frames implement GetScrollTargetFrame but we don't want
- // to use it here.
- if (frame->GetType() != nsGkAtoms::menuFrame) {
+ // to use it here. Similar for comboboxes.
+ if (frame->GetType() != nsGkAtoms::menuFrame &&
+ frame->GetType() != nsGkAtoms::comboboxControlFrame) {
nsIScrollableFrame *scrollFrame = frame->GetScrollTargetFrame();
if (scrollFrame)
return scrollFrame;
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index fad334d694d..ff89a7c1744 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -86,6 +86,7 @@ _TEST_FILES1 = \
bug298064-subframe.html \
test_xhr_forbidden_headers.html \
test_bug311681.xml \
+ test_bug320799.html \
test_bug322317.html \
test_bug330925.xhtml \
test_bug331959.html \
diff --git a/content/base/test/test_bug320799.html b/content/base/test/test_bug320799.html
new file mode 100644
index 00000000000..c4cd72b3531
--- /dev/null
+++ b/content/base/test/test_bug320799.html
@@ -0,0 +1,69 @@
+
+
+
+
+ Test for Bug 320799
+
+
+
+
+Mozilla Bug 320799
+
+
+
+
+
+
+
+
+
+
+
+
+