diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index bf0ca788ac3..bc7e015330b 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -3514,7 +3514,9 @@ nsXULDocument::StartLayout(void)
       if (! webShell)
           return NS_ERROR_UNEXPECTED;
 
-      webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN);
+      // Set current scrolling state (for this document) but not
+      // initial scrolling state (for this and all future documents)
+      webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN, PR_FALSE);
 
       nsCOMPtr<nsIWebShellContainer> webShellContainer;
       webShell->GetContainer(*getter_AddRefs(webShellContainer));
diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp
index bf0ca788ac3..bc7e015330b 100644
--- a/mozilla/rdf/content/src/nsXULDocument.cpp
+++ b/mozilla/rdf/content/src/nsXULDocument.cpp
@@ -3514,7 +3514,9 @@ nsXULDocument::StartLayout(void)
       if (! webShell)
           return NS_ERROR_UNEXPECTED;
 
-      webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN);
+      // Set current scrolling state (for this document) but not
+      // initial scrolling state (for this and all future documents)
+      webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN, PR_FALSE);
 
       nsCOMPtr<nsIWebShellContainer> webShellContainer;
       webShell->GetContainer(*getter_AddRefs(webShellContainer));