diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 1ee499c69ed7226ad49715cc861fdb3c551c62bb..491d6956b560ed14ec951aab61c7efe40140f257 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Update script.aculo.us to 1.8.0.1.  [madrobby]
+
 * Add 'disabled' attribute to <OPTION> separators used in time zone and country selects.  Closes #10354 [hasmanyjosh]
 
 * Added the same record identification guessing rules to fields_for as form_for has [DHH]
diff --git a/actionpack/lib/action_view/helpers/javascripts/controls.js b/actionpack/lib/action_view/helpers/javascripts/controls.js
index da7bfa2a77e543badc0cca330f3f0c1a5a7ea49a..fbc4418b833389afecbabba4928288f37d40fec3 100644
--- a/actionpack/lib/action_view/helpers/javascripts/controls.js
+++ b/actionpack/lib/action_view/helpers/javascripts/controls.js
@@ -86,7 +86,7 @@ Autocompleter.Base = Class.create({
     Element.hide(this.update);
 
     Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
   },
 
   show: function() {
@@ -142,12 +142,12 @@ Autocompleter.Base = Class.create({
        case Event.KEY_UP:
          this.markPrevious();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
        case Event.KEY_DOWN:
          this.markNext();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
       }
      else 
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index cf0425a22e73e57a83f9331d238f4043fcb87a0f..e56e5f2547446fc5af3c668765431d005ae8ad75 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Update script.aculo.us to 1.8.0.1.  [madrobby]
+
 * Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 [jbarnette]
 
 * Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette]
diff --git a/railties/html/javascripts/controls.js b/railties/html/javascripts/controls.js
index da7bfa2a77e543badc0cca330f3f0c1a5a7ea49a..fbc4418b833389afecbabba4928288f37d40fec3 100644
--- a/railties/html/javascripts/controls.js
+++ b/railties/html/javascripts/controls.js
@@ -86,7 +86,7 @@ Autocompleter.Base = Class.create({
     Element.hide(this.update);
 
     Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
   },
 
   show: function() {
@@ -142,12 +142,12 @@ Autocompleter.Base = Class.create({
        case Event.KEY_UP:
          this.markPrevious();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
        case Event.KEY_DOWN:
          this.markNext();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
       }
      else