diff --git a/dom/src/base/nsFocusController.cpp b/dom/src/base/nsFocusController.cpp
index 18e2ea335867..74b69b49086e 100644
--- a/dom/src/base/nsFocusController.cpp
+++ b/dom/src/base/nsFocusController.cpp
@@ -536,7 +536,8 @@ nsFocusController::SetActive(PRBool aActive)
       UpdateWWActiveWindow();
     else
       mUpdateWindowWatcher = PR_TRUE;
-  }
+  } else
+    mUpdateWindowWatcher = PR_FALSE;
 
   return NS_OK;
 }