diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f673b35..dd32de7 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -4,13 +4,12 @@ class TagsController < ApplicationController
   def create
     image = @current_user.images.find(params[:image_id])
     tag = params[:tag]
-    image.tags << tag unless image.tags.include?(tag)
-    image.save
-
-    if request.xhr?
+    if !image.tags.include?(tag)
+      image.tags << tag
+      image.save
       render partial: "tags/tag", locals: { image: image, tag: tag }
     else
-      redirect_to([:user, image])
+      head 200, content_type: "text/html"
     end
   end
 
@@ -20,9 +19,6 @@ class TagsController < ApplicationController
     image.tags.delete(tag)
     image.save
 
-    respond_to do |format|
-      format.html { redirect_to([:user, image]) }
-      format.js { render "index", locals: { image: image, tags: image.tags } }
-    end
+    render json: { status: :ok }
   end
 end
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 94001f9..e821339 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -1,8 +1,9 @@
-<li class="image-tag" id="tag-<%= tag %>">
-  <%= tag %>
-  <%= link_to "&times;".html_safe,
-    user_image_tag_path(image, tag),
-    method: :delete,
-    remote: true,
-    class: "delete-tag" %>
+<li class="image-tag"
+    id="tag-<%= tag %>"
+    data-controller="tag">
+    <span data-target="tag.name"><%= tag %></span>
+    <%= link_to "&times;".html_safe,
+      user_image_tag_path(image, tag),
+      data: { action: "click->tag#delete" },
+      class: "delete-tag" %>
 </li>