diff --git a/modules/plugin/base/src/nsPluginViewer.cpp b/modules/plugin/base/src/nsPluginViewer.cpp
index dc0bece0ca1c..b667c3be9a7e 100644
--- a/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/modules/plugin/base/src/nsPluginViewer.cpp
@@ -1154,7 +1154,9 @@ nsEventStatus pluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
 #ifdef XP_MAC
     //if (mWidget != NULL) {  // check for null mWidget
         EventRecord* event = (EventRecord*)anEvent.nativeMsg;
-        if (event == NULL || event->what == nullEvent) {
+        if (event == NULL || event->what == nullEvent ||
+            anEvent.message == NS_KEY_PRESS           ||
+            anEvent.message == NS_CONTEXTMENU_MESSAGE_START) {
             EventRecord macEvent;
             GUItoMacEvent(anEvent, macEvent);
             event = &macEvent;
diff --git a/modules/plugin/nglsrc/nsPluginViewer.cpp b/modules/plugin/nglsrc/nsPluginViewer.cpp
index dc0bece0ca1c..b667c3be9a7e 100644
--- a/modules/plugin/nglsrc/nsPluginViewer.cpp
+++ b/modules/plugin/nglsrc/nsPluginViewer.cpp
@@ -1154,7 +1154,9 @@ nsEventStatus pluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
 #ifdef XP_MAC
     //if (mWidget != NULL) {  // check for null mWidget
         EventRecord* event = (EventRecord*)anEvent.nativeMsg;
-        if (event == NULL || event->what == nullEvent) {
+        if (event == NULL || event->what == nullEvent ||
+            anEvent.message == NS_KEY_PRESS           ||
+            anEvent.message == NS_CONTEXTMENU_MESSAGE_START) {
             EventRecord macEvent;
             GUItoMacEvent(anEvent, macEvent);
             event = &macEvent;