diff --git a/mozilla/content/xbl/builtin/htmlBindings.xml b/mozilla/content/xbl/builtin/htmlBindings.xml
index eb601745d65..f29efb68aad 100644
--- a/mozilla/content/xbl/builtin/htmlBindings.xml
+++ b/mozilla/content/xbl/builtin/htmlBindings.xml
@@ -30,43 +30,7 @@ Can't yet put script tags in XBL (hyatt has the bug)
 -->
       </handler>
 
-      <handler event="keypress" key=" ">
-      <![CDATA[
-        var v = document.commandDispatcher.focusedElement;
-
-        if (v) {
-          switch (v.localName) {
-            case 'TEXTAREA':
-              return true;
-    	      case 'INPUT':
-              switch (v.getAttribute('type').toLowerCase()) {
-		            case 'button':
-		            case 'image':
-		            case 'submit':
-		            case 'reset':
-		            case 'checkbox':
-		            case 'radio':
-		            case 'file':
-            	    return true;
-              }
-	            break;
-            case 'BUTTON':
-              switch (v.getAttribute('type').toLowerCase()) {
-                case 'submit':
-		            case 'button':
-		            case 'reset':
-                  return true;
-              }
-	            break;
-          }
-        }
-        var controller =
-          document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-          controller.doCommand('cmd_scrollPageDown');
-
-        return true;
-      ]]>
-      </handler>
+      <handler event="keypress" key=" " command="cmd_scrollPageDown" />
       <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_scrollPageUp" />
       <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_scrollPageDown" />
 
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
index 0999710e491..7119efe3fe9 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -194,7 +194,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEven
   nsCOMPtr<nsIAtom> tag;
   mHandlerElement->GetTag(*getter_AddRefs(tag));
   PRBool isXULKey = (tag.get() == nsXULAtoms::key);
-    
+
   PRBool isReceiverCommandElement = PR_FALSE;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aReceiver));
   if (isXULKey && content && content.get() != mHandlerElement)
@@ -862,6 +862,20 @@ PRInt32 nsXBLPrototypeHandler::KeyToMask(PRInt32 key)
   return cControl;  // for warning avoidance
 }
 
+void
+nsXBLPrototypeHandler::GetEventType(nsAWritableString &type)
+{
+  mHandlerElement->GetAttribute(kNameSpaceID_None, kTypeAtom, type);
+  
+  if (type.IsEmpty()) {
+    // If we're a XUL key element, let's assume that we're "keypress".
+    nsCOMPtr<nsIAtom> tag;
+    mHandlerElement->GetTag(*getter_AddRefs(tag));
+    if (tag.get() == kKeyAtom)
+      type = NS_LITERAL_STRING("keypress");
+  }
+}
+
 void
 nsXBLPrototypeHandler::ConstructMask()
 {
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.h b/mozilla/content/xbl/src/nsXBLPrototypeHandler.h
index b9d8139309e..c31c659114b 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.h
+++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.h
@@ -84,6 +84,7 @@ protected:
   
   inline PRInt32 GetMatchingKeyCode(const nsString& aKeyName);
   void ConstructMask();
+  void GetEventType(nsAWritableString& type);
   PRBool ModifiersMatchMask(nsIDOMUIEvent* aEvent);
 
   inline PRBool KeyEventMatched(nsIDOMKeyEvent* aKeyEvent);