diff --git a/app/assets/javascripts/autocomplete.js b/app/assets/javascripts/autocomplete.js
index ff600c866..9a8841708 100644
--- a/app/assets/javascripts/autocomplete.js
+++ b/app/assets/javascripts/autocomplete.js
@@ -46,6 +46,7 @@
 
     $fields_multiple.autocomplete({
       delay: 100,
+      autoFocus: true,
       focus: function() {
         return false;
       },
@@ -148,6 +149,7 @@
 
     $fields_single.autocomplete({
       minLength: 1,
+      autoFocus: true,
       source: function(req, resp) {
         Danbooru.Autocomplete.normal_source(req.term, resp);
       }
diff --git a/vendor/assets/javascripts/jquery-ui-autocomplete-custom.js b/vendor/assets/javascripts/jquery-ui-autocomplete-custom.js
index d7e3eb70c..bc0163253 100644
--- a/vendor/assets/javascripts/jquery-ui-autocomplete-custom.js
+++ b/vendor/assets/javascripts/jquery-ui-autocomplete-custom.js
@@ -116,7 +116,6 @@ $.widget( "ui.autocomplete", {
           suppressKeyPress = true;
           this._keyEvent( "next", event );
           break;
-        case keyCode.SPACE:
         case keyCode.ENTER:
         case keyCode.NUMPAD_ENTER:
           // when menu is open and has focus