diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index f93994307d1..fc0bbe290dc 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -511,6 +511,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
         // fire focus on window, not document
         nsCOMPtr<nsIScriptGlobalObject> globalObject;
         mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
+        mDocument->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status);
         if(!globalObject) break;
                      
         globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status); 
@@ -554,6 +555,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
                 // fire focus on window, not document
                 nsCOMPtr<nsIScriptGlobalObject> globalObject;
                 mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
+                mDocument->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
                 if(!globalObject) break;
                      
                 globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status); 
diff --git a/mozilla/layout/events/src/nsEventStateManager.cpp b/mozilla/layout/events/src/nsEventStateManager.cpp
index f93994307d1..fc0bbe290dc 100644
--- a/mozilla/layout/events/src/nsEventStateManager.cpp
+++ b/mozilla/layout/events/src/nsEventStateManager.cpp
@@ -511,6 +511,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
         // fire focus on window, not document
         nsCOMPtr<nsIScriptGlobalObject> globalObject;
         mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
+        mDocument->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status);
         if(!globalObject) break;
                      
         globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status); 
@@ -554,6 +555,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
                 // fire focus on window, not document
                 nsCOMPtr<nsIScriptGlobalObject> globalObject;
                 mDocument->GetScriptGlobalObject(getter_AddRefs(globalObject));
+                mDocument->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
                 if(!globalObject) break;
                      
                 globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);