diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp
index e67696feaa90..696d480096d1 100644
--- a/dom/src/base/nsGlobalWindow.cpp
+++ b/dom/src/base/nsGlobalWindow.cpp
@@ -385,10 +385,9 @@ GlobalWindowImpl::GetOpener(nsIDOMWindow** aOpener)
 NS_IMETHODIMP
 GlobalWindowImpl::SetOpener(nsIDOMWindow* aOpener)
 {
-  if (nsnull == aOpener) {
-    NS_IF_RELEASE(mOpener);
-    mOpener = nsnull;
-  }
+  NS_IF_RELEASE(mOpener);
+  mOpener = aOpener;
+  NS_IF_ADDREF(mOpener);
   return NS_OK;
 }