diff --git a/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp b/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp
index e6b3d1bc9cd..4c591120160 100644
--- a/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp
@@ -589,6 +589,7 @@ nsGenericDOMDataNode::HandleDOMEvent(nsIPresContext& aPresContext,
   
   nsIDOMEvent* domEvent = nsnull;
   if (DOM_EVENT_INIT == aFlags) {
+    aEventStatus = nsEventStatus_eIgnore;
     nsIEventStateManager *manager;
     if (NS_OK == aPresContext.GetEventStateManager(&manager)) {
       manager->SetEventTarget(mContent);
diff --git a/mozilla/layout/html/content/src/nsGenericElement.cpp b/mozilla/layout/html/content/src/nsGenericElement.cpp
index 648ebb2e813..7e57da630eb 100644
--- a/mozilla/layout/html/content/src/nsGenericElement.cpp
+++ b/mozilla/layout/html/content/src/nsGenericElement.cpp
@@ -947,11 +947,11 @@ nsGenericElement::HandleDOMEvent(nsIPresContext& aPresContext,
                                      PRUint32 aFlags,
                                      nsEventStatus& aEventStatus)
 {
-  aEventStatus = nsEventStatus_eIgnore;
   nsresult ret = NS_OK;
   
   nsIDOMEvent* domEvent = nsnull;
   if (DOM_EVENT_INIT == aFlags) {
+    aEventStatus = nsEventStatus_eIgnore;
     nsIEventStateManager *manager;
     if (NS_OK == aPresContext.GetEventStateManager(&manager)) {
       manager->SetEventTarget(mContent);