diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp
index af8fe4cc234..4b5d5932b94 100644
--- a/mozilla/view/src/nsViewManager.cpp
+++ b/mozilla/view/src/nsViewManager.cpp
@@ -2021,7 +2021,7 @@ nsEventStatus nsViewManager::HandleEvent(nsView* aView, nsGUIEvent* aEvent, PRBo
 
   // accessibility events and key events are dispatched directly to the focused view
   if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT || aEvent->message == NS_CONTEXTMENU_KEY
-      || NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent)) {
+      || NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent) || NS_IS_FOCUS_EVENT(aEvent)) {
     nsEventStatus status = nsEventStatus_eIgnore;
     if (obs) {
        PRBool handled;
diff --git a/mozilla/widget/public/nsGUIEvent.h b/mozilla/widget/public/nsGUIEvent.h
index a3b400f03d1..46e13eab352 100644
--- a/mozilla/widget/public/nsGUIEvent.h
+++ b/mozilla/widget/public/nsGUIEvent.h
@@ -589,6 +589,13 @@ enum nsDragDropEventStatus {
         ((evnt)->message == NS_RECONVERSION_QUERY) || \
         ((evnt)->message == NS_COMPOSITION_QUERY))
 
+#define NS_IS_FOCUS_EVENT(evnt) \
+       (((evnt)->message == NS_GOTFOCUS) ||  \
+        ((evnt)->message == NS_LOSTFOCUS) ||  \
+        ((evnt)->message == NS_ACTIVATE) || \
+        ((evnt)->message == NS_DEACTIVATE) || \
+        ((evnt)->message == NS_PLUGIN_ACTIVATE))
+
 /*
  * Virtual key bindings for keyboard events.
  * These come from nsIDOMKeyEvent.h, which is generated from MouseKeyEvent.idl.