diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index 32e097c6503..d7f7cd65eeb 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -706,6 +706,11 @@ nsHTMLFrameInnerFrame::Destroy(nsIPresContext* aPresContext)
       docShell->GetContentViewer(getter_AddRefs(content_viewer));
 
       if (content_viewer) {
+        // Mark the content viewer as non-sticky so that the presentation
+        // can safely go away when this frame is destroyed.
+
+        content_viewer->SetSticky(PR_FALSE);
+
         // Hide the content viewer now that the frame is going away...
 
         content_viewer->Hide();
@@ -1024,16 +1029,6 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIContentViewer> content_viewer;
-  docShell->GetContentViewer(getter_AddRefs(content_viewer));
-
-  if (content_viewer) {
-    // Mark the content viewer as non-sticky so that the presentation
-    // can safely go away when this frame is destroyed.
-
-    content_viewer->SetSticky(PR_FALSE);
-  }
-
   nsCOMPtr<nsIContent> content;
   GetParentContent(getter_AddRefs(content));
 
diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp
index 32e097c6503..d7f7cd65eeb 100644
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@@ -706,6 +706,11 @@ nsHTMLFrameInnerFrame::Destroy(nsIPresContext* aPresContext)
       docShell->GetContentViewer(getter_AddRefs(content_viewer));
 
       if (content_viewer) {
+        // Mark the content viewer as non-sticky so that the presentation
+        // can safely go away when this frame is destroyed.
+
+        content_viewer->SetSticky(PR_FALSE);
+
         // Hide the content viewer now that the frame is going away...
 
         content_viewer->Hide();
@@ -1024,16 +1029,6 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIContentViewer> content_viewer;
-  docShell->GetContentViewer(getter_AddRefs(content_viewer));
-
-  if (content_viewer) {
-    // Mark the content viewer as non-sticky so that the presentation
-    // can safely go away when this frame is destroyed.
-
-    content_viewer->SetSticky(PR_FALSE);
-  }
-
   nsCOMPtr<nsIContent> content;
   GetParentContent(getter_AddRefs(content));