diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 51da831edf9..2115a659d11 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -331,8 +331,8 @@ XULPopupListenerImpl::MouseOut(nsIDOMEvent* aMouseEvent)
   }
   
   if ( mPopupContent ) {
-    mPopupContent->RemoveAttribute("menugenerated");  // hide the popup
-    mPopupContent->RemoveAttribute("menuactive");
+    nsCOMPtr<nsIDOMXULPopupElement> popupElement = do_QueryInterface(mPopupContent);
+    popupElement->ClosePopup();
 
     mPopupContent = nsnull;  // release the popup
     
diff --git a/rdf/content/src/nsXULPopupListener.cpp b/rdf/content/src/nsXULPopupListener.cpp
index 51da831edf9..2115a659d11 100644
--- a/rdf/content/src/nsXULPopupListener.cpp
+++ b/rdf/content/src/nsXULPopupListener.cpp
@@ -331,8 +331,8 @@ XULPopupListenerImpl::MouseOut(nsIDOMEvent* aMouseEvent)
   }
   
   if ( mPopupContent ) {
-    mPopupContent->RemoveAttribute("menugenerated");  // hide the popup
-    mPopupContent->RemoveAttribute("menuactive");
+    nsCOMPtr<nsIDOMXULPopupElement> popupElement = do_QueryInterface(mPopupContent);
+    popupElement->ClosePopup();
 
     mPopupContent = nsnull;  // release the popup