diff --git a/app/javascript/controllers/tags_controller.js b/app/javascript/controllers/tags_controller.js
index ab67dc9..291c6fc 100644
--- a/app/javascript/controllers/tags_controller.js
+++ b/app/javascript/controllers/tags_controller.js
@@ -13,8 +13,8 @@ export default class extends Controller {
       .then(response => {
         if (response.status == 200) {
           this.tagListTarget.innerHTML += response.data;
+          this.tagTarget.value = "";
         };
-        this.tagTarget.value = "";
       })
   }
 }
diff --git a/app/views/images/_info.html.erb b/app/views/images/_info.html.erb
index 91cc7fd..54df22e 100644
--- a/app/views/images/_info.html.erb
+++ b/app/views/images/_info.html.erb
@@ -5,9 +5,9 @@
     <div class="new-tag-form">
       <%= form_tag user_image_tags_path(image),
         method: :post,
-        data: { remote: true, action: "tags#create" } do %>
+        data: { action: "tags#create" } do %>
         <%= text_field_tag :tag, nil, data: { target: "tags.tag" } %>
-        <%= submit_tag "Add Tag" %>
+        <%= submit_tag "Add Tag", data: { disable_with: false } %>
       <% end %>
     </div>
   </div>
diff --git a/spec/features/user_manages_image_tags_spec.rb b/spec/features/user_manages_image_tags_spec.rb
index 725c6f3..ce41408 100644
--- a/spec/features/user_manages_image_tags_spec.rb
+++ b/spec/features/user_manages_image_tags_spec.rb
@@ -40,7 +40,7 @@ feature "user manages image tags by visitng images show page" do
   scenario "user can add a tag to the list of tags", js: true do
     tags = ["one", "two"]
     user = User.create(uid: "123")
-    new_tag = "new tag"
+    new_tag = "newtag"
     Image.create(
       user: user,
       tags: tags,