diff --git a/layout/xul/base/public/nsIPopupSetFrame.h b/layout/xul/base/public/nsIPopupSetFrame.h
index a4ba08f2275..47f10143d18 100644
--- a/layout/xul/base/public/nsIPopupSetFrame.h
+++ b/layout/xul/base/public/nsIPopupSetFrame.h
@@ -37,7 +37,7 @@ class nsIPopupSetFrame : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IPOPUPSETFRAME_IID; return iid; }
 
-  NS_IMETHOD CreatePopup(nsIFrame* aElementFrame, nsIContent* aPopupContent, 
+  NS_IMETHOD CreatePopup(nsIContent* aElementContent, nsIContent* aPopupContent, 
                          PRInt32 aXPos, PRInt32 aYPos, 
                          const nsString& aPopupType, const nsString& anAnchorAlignment,
                          const nsString& aPopupAlignment) = 0;
diff --git a/layout/xul/base/src/nsPopupSetBoxObject.cpp b/layout/xul/base/src/nsPopupSetBoxObject.cpp
index 6e5d2ec6743..9d6c63fd6f3 100644
--- a/layout/xul/base/src/nsPopupSetBoxObject.cpp
+++ b/layout/xul/base/src/nsPopupSetBoxObject.cpp
@@ -136,12 +136,7 @@ nsPopupSetBoxObject::CreatePopup(nsIDOMElement* aSrcContent,
   if (!shell)
     return NS_OK;
 
-  nsIFrame* srcFrame;
-  shell->GetPrimaryFrameFor(srcContent, &srcFrame);
-  if (!srcFrame)
-    return NS_OK;
-
-  return popupFrame->CreatePopup(srcFrame, popupContent, aXPos, aYPos, aPopupType, anAnchorAlignment, aPopupAlignment);
+  return popupFrame->CreatePopup(srcContent, popupContent, aXPos, aYPos, aPopupType, anAnchorAlignment, aPopupAlignment);
 }
 
 // Creation Routine ///////////////////////////////////////////////////////////////////////
diff --git a/layout/xul/base/src/nsPopupSetFrame.cpp b/layout/xul/base/src/nsPopupSetFrame.cpp
index 60ffee5e10c..e4ab807b6c7 100644
--- a/layout/xul/base/src/nsPopupSetFrame.cpp
+++ b/layout/xul/base/src/nsPopupSetFrame.cpp
@@ -99,7 +99,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsBoxFrame)
 //
 nsPopupSetFrame::nsPopupSetFrame(nsIPresShell* aShell):nsBoxFrame(aShell),
 mPresContext(nsnull), 
-mElementFrame(nsnull), 
+mElementContent(nsnull), 
 mCreateHandlerSucceeded(PR_FALSE),
 mLastPref(-1,-1)
 {
@@ -329,7 +329,7 @@ nsPopupSetFrame::RePositionPopup(nsBoxLayoutState& aState)
 {
   // Sync up the view.
   nsIFrame* activeChild = GetActiveChild();
-  if (activeChild && mElementFrame) {
+  if (activeChild && mElementContent) {
 
     nsCOMPtr<nsIContent> menuPopupContent;
     activeChild->GetContent(getter_AddRefs(menuPopupContent));
@@ -343,8 +343,12 @@ nsPopupSetFrame::RePositionPopup(nsBoxLayoutState& aState)
     if (popupAlign.IsEmpty())
       popupAlign.AssignWithConversion("topleft");
    
+    nsIFrame* frameToSyncTo = nsnull;
+    nsCOMPtr<nsIPresShell> presShell;
     nsIPresContext* presContext = aState.GetPresContext();
-    ((nsMenuPopupFrame*)activeChild)->SyncViewWithFrame(presContext, popupAnchor, popupAlign, mElementFrame, mXPos, mYPos);
+    presContext->GetShell(getter_AddRefs(presShell));
+    presShell->GetPrimaryFrameFor ( mElementContent, &frameToSyncTo );
+    ((nsMenuPopupFrame*)activeChild)->SyncViewWithFrame(presContext, popupAnchor, popupAlign, frameToSyncTo, mXPos, mYPos);
   }
 }
 
@@ -422,14 +426,14 @@ nsPopupSetFrame::AppendFrames(nsIPresContext* aPresContext,
 }
 
 NS_IMETHODIMP
-nsPopupSetFrame::CreatePopup(nsIFrame* aElementFrame, nsIContent* aPopupContent, 
+nsPopupSetFrame::CreatePopup(nsIContent* aElementContent, nsIContent* aPopupContent, 
                              PRInt32 aXPos, PRInt32 aYPos, 
                              const nsString& aPopupType, const nsString& anAnchorAlignment,
                              const nsString& aPopupAlignment)
 {
-  // Cache the element frame.
-  mElementFrame = aElementFrame;
+  // Cache the element content we're supposed to sync to
   mPopupType = aPopupType;
+  mElementContent = aElementContent;
   
   // Show the popup at the specified position.
   mXPos = aXPos;
@@ -479,7 +483,7 @@ nsPopupSetFrame::DestroyPopup()
 
   // clear things out for next time
   mCreateHandlerSucceeded = PR_FALSE;
-  mElementFrame = nsnull;
+  mElementContent = nsnull;
   mXPos = mYPos = 0;
   mLastPref.width = -1;
   mLastPref.height = -1;
diff --git a/layout/xul/base/src/nsPopupSetFrame.h b/layout/xul/base/src/nsPopupSetFrame.h
index 9222bf57196..1b224c63857 100644
--- a/layout/xul/base/src/nsPopupSetFrame.h
+++ b/layout/xul/base/src/nsPopupSetFrame.h
@@ -91,7 +91,7 @@ public:
                           nsIAtom*        aListName,
                           nsIFrame*       aOldFrame);
 
-  NS_IMETHOD CreatePopup(nsIFrame* aElementFrame, nsIContent* aPopupContent, 
+  NS_IMETHOD CreatePopup(nsIContent* aElementContent, nsIContent* aPopupContent, 
                          PRInt32 aXPos, PRInt32 aYPos, 
                          const nsString& aPopupType, const nsString& anAnchorAlignment,
                          const nsString& aPopupAlignment);
@@ -126,7 +126,7 @@ protected:
   nsFrameList mPopupFrames;
   nsIPresContext* mPresContext; // Our pres context.
 
-  nsIFrame* mElementFrame; // The frame that is having something popped up over it.
+  nsIContent* mElementContent; // The content that is having something popped up over it <weak>
 
   PRInt32 mXPos;                // Active child's x position
   PRInt32 mYPos;                // Active child's y position