diff --git a/app/assets/javascripts/autocomplete.js.erb b/app/assets/javascripts/autocomplete.js.erb
index 2f0fb5b10..c22ab7189 100644
--- a/app/assets/javascripts/autocomplete.js.erb
+++ b/app/assets/javascripts/autocomplete.js.erb
@@ -109,6 +109,12 @@
         return false;
       },
       select: function(event, ui) {
+        var query = Danbooru.Autocomplete.parse_query(this.value, this.selectionStart);
+        if (event.key === "Enter" && query.term === ui.item.value) {
+          $(this).parents("form").submit();
+          return false;
+        }
+
         var before_caret_text = this.value.substring(0, this.selectionStart);
         var after_caret_text = this.value.substring(this.selectionStart);
         var prefixes = "-|~|" + "<%= TagCategory.mapping.keys.map {|category| category + ':'}.join('|') %>";