diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 01a1947433a..a012bec22cc 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -2153,14 +2153,14 @@ RDFElementImpl::HandleDOMEvent(nsIPresContext& aPresContext,
         nsString tagName;
         GetTagName(tagName);
         if (tagName == "menu" || tagName == "menuitem" ||
-            tagName == "menubar") {
+            tagName == "menubar" || tagName == "key" || tagName == "keyset") {
             nsCOMPtr<nsIEventListenerManager> listenerManager;
             if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
-                NS_ERROR("Unable to instantiate a listener manager on a menu event.");
+                NS_ERROR("Unable to instantiate a listener manager on a menu/key event.");
                 return ret;
             }
             if (NS_FAILED(ret = listenerManager->CreateEvent(aPresContext, aEvent, aDOMEvent))) {
-                NS_ERROR("Menu event will fail without the ability to create the event early.");
+                NS_ERROR("Menu/key event will fail without the ability to create the event early.");
                 return ret;
             }
             domEvent->SetTarget(this);
diff --git a/rdf/content/src/nsRDFElement.cpp b/rdf/content/src/nsRDFElement.cpp
index 01a1947433a..a012bec22cc 100644
--- a/rdf/content/src/nsRDFElement.cpp
+++ b/rdf/content/src/nsRDFElement.cpp
@@ -2153,14 +2153,14 @@ RDFElementImpl::HandleDOMEvent(nsIPresContext& aPresContext,
         nsString tagName;
         GetTagName(tagName);
         if (tagName == "menu" || tagName == "menuitem" ||
-            tagName == "menubar") {
+            tagName == "menubar" || tagName == "key" || tagName == "keyset") {
             nsCOMPtr<nsIEventListenerManager> listenerManager;
             if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
-                NS_ERROR("Unable to instantiate a listener manager on a menu event.");
+                NS_ERROR("Unable to instantiate a listener manager on a menu/key event.");
                 return ret;
             }
             if (NS_FAILED(ret = listenerManager->CreateEvent(aPresContext, aEvent, aDOMEvent))) {
-                NS_ERROR("Menu event will fail without the ability to create the event early.");
+                NS_ERROR("Menu/key event will fail without the ability to create the event early.");
                 return ret;
             }
             domEvent->SetTarget(this);
diff --git a/rdf/content/src/nsXULElement.cpp b/rdf/content/src/nsXULElement.cpp
index 01a1947433a..a012bec22cc 100644
--- a/rdf/content/src/nsXULElement.cpp
+++ b/rdf/content/src/nsXULElement.cpp
@@ -2153,14 +2153,14 @@ RDFElementImpl::HandleDOMEvent(nsIPresContext& aPresContext,
         nsString tagName;
         GetTagName(tagName);
         if (tagName == "menu" || tagName == "menuitem" ||
-            tagName == "menubar") {
+            tagName == "menubar" || tagName == "key" || tagName == "keyset") {
             nsCOMPtr<nsIEventListenerManager> listenerManager;
             if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) {
-                NS_ERROR("Unable to instantiate a listener manager on a menu event.");
+                NS_ERROR("Unable to instantiate a listener manager on a menu/key event.");
                 return ret;
             }
             if (NS_FAILED(ret = listenerManager->CreateEvent(aPresContext, aEvent, aDOMEvent))) {
-                NS_ERROR("Menu event will fail without the ability to create the event early.");
+                NS_ERROR("Menu/key event will fail without the ability to create the event early.");
                 return ret;
             }
             domEvent->SetTarget(this);