diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 6f18d009562..e0030baf4df 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -13320,6 +13320,11 @@ nsresult nsCSSFrameConstructor::RemoveFixedItems(const nsFrameConstructorState&
         nsIFrame *placeholderFrame;
         mPresShell->GetPlaceholderFrameFor(fixedChild, &placeholderFrame);
         NS_ASSERTION(placeholderFrame, "no placeholder for fixed-pos frame");
+        NS_ASSERTION(placeholderFrame->GetType() ==
+                     nsLayoutAtoms::placeholderFrame,
+                     "Wrong type");
+        aState.mFrameManager->UnregisterPlaceholderFrame(
+          NS_STATIC_CAST(nsPlaceholderFrame*, placeholderFrame));
         nsIFrame* placeholderParent = placeholderFrame->GetParent();
         ::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame);
         rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull,