diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 56b18770a..71c202188 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -68,6 +68,12 @@
         });
       }
     });
+    $fields.on("autocompleteopen", function() {
+      Danbooru.autocompleting = true;
+    });
+    $fields.on("autocompleteclose", function() {
+      setTimeout(function() {Danbooru.autocompleting = false;}, 100);
+    });
 
     var render_tag = function(list, tag) {
       var $link = $("<a/>").addClass("tag-type-" + tag.category).text(tag.label);
diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 26e9796c7..82c7c1dde 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -17,8 +17,10 @@
 
   Danbooru.Upload.initialize_enter_on_tags = function() {
     $("#upload_tag_string,#post_tag_string").bind("keydown", "return", function(e) {
-      $("#form").trigger("submit");
-      $("#quick-edit-form").trigger("submit");
+      if (!Danbooru.autocompleting) {
+        $("#form").trigger("submit");
+        $("#quick-edit-form").trigger("submit");
+      }
       e.preventDefault();
     });
   }
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index bbf1a315e..f39477060 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.17.0"
+      "2.18.0"
     end
 
     # The name of this Danbooru.