--- /drupal/misc/ahah.old.js	Mon Feb 11 09:46:28 2008
+++ /drupal/misc/ahah.js	Fri Dec 31 11:36:54 2010
@@ -101,8 +101,14 @@
   });
   // If necessary, enable keyboard submission so that AHAH behaviors
   // can be triggered through keyboard input as well as e.g. a mousedown
-  // action.
-  if (element_settings.keypress) {
+  // action. For buttons, the enter key or spacebar fires an onclick event.
+  if(element_settings.button){
+	  $(element_settings.element).click(function(){
+		  $(element_settings.element).trigger(element_settings.event);
+		  return false;
+	  });
+  }
+  else if (element_settings.keypress) {
     $(element_settings.element).keypress(function(event) {
       // Detect enter key.
       if (event.which == 13 || event.which == 32) {