diff --git a/app/assets/stylesheets/admin/action.scss b/app/assets/stylesheets/admin/action.scss
new file mode 100644
index 000000000..cca144bbb
--- /dev/null
+++ b/app/assets/stylesheets/admin/action.scss
@@ -0,0 +1,6 @@
+.admin .admin-action {
+
+  &[disabled] {
+    @include button-disabled;
+  }
+}
diff --git a/app/components/admin/action_component.html.erb b/app/components/admin/action_component.html.erb
index 938c1852f..4fb3324e8 100644
--- a/app/components/admin/action_component.html.erb
+++ b/app/components/admin/action_component.html.erb
@@ -1,4 +1,4 @@
-<% if options[:method] && options[:method] != :get %>
+<% if button? %>
   <%= button_to(path, html_options) { text } %>
 <% else %>
   <%= link_to text, path, html_options %>
diff --git a/app/components/admin/action_component.rb b/app/components/admin/action_component.rb
index ab713b642..2481a07b0 100644
--- a/app/components/admin/action_component.rb
+++ b/app/components/admin/action_component.rb
@@ -10,6 +10,10 @@ class Admin::ActionComponent < ApplicationComponent
 
   private
 
+    def button?
+      options[:method] && options[:method] != :get
+    end
+
     def text
       options[:text] || t("admin.actions.#{action}")
     end
@@ -22,12 +26,15 @@ class Admin::ActionComponent < ApplicationComponent
       {
         class: html_class,
         "aria-label": label,
-        data: { confirm: confirmation_text }
-      }.merge(options.except(:"aria-label", :confirm, :path, :text))
+        data: {
+          confirm: confirmation_text,
+          disable_with: (text if button?)
+        }
+      }.merge(options.except(:"aria-label", :class, :confirm, :path, :text))
     end
 
     def html_class
-      "#{action.to_s.gsub("_", "-")}-link"
+      "admin-action #{options[:class] || "#{action.to_s.gsub("_", "-")}-link"}".strip
     end
 
     def label
diff --git a/spec/components/admin/action_component_spec.rb b/spec/components/admin/action_component_spec.rb
index e156b13da..e32e8a6f6 100644
--- a/spec/components/admin/action_component_spec.rb
+++ b/spec/components/admin/action_component_spec.rb
@@ -1,10 +1,19 @@
 require "rails_helper"
 
 describe Admin::ActionComponent do
-  it "includes an HTML class for the action" do
-    render_inline Admin::ActionComponent.new(:edit, double, path: "/")
+  describe "HTML class" do
+    it "includes an HTML class for the action by default" do
+      render_inline Admin::ActionComponent.new(:edit, double, path: "/")
 
-    expect(page).to have_css "a.edit-link"
+      expect(page).to have_css "a.edit-link.admin-action"
+    end
+
+    it "keeps the admin-action class when the class is overwritten" do
+      render_inline Admin::ActionComponent.new(:edit, double, path: "/", class: "modify-link")
+
+      expect(page).to have_css "a.modify-link.admin-action"
+      expect(page).not_to have_css ".edit-link"
+    end
   end
 
   describe "aria-label attribute" do
@@ -105,4 +114,18 @@ describe Admin::ActionComponent do
       end
     end
   end
+
+  describe "data-disable-with attribute" do
+    it "is not rendered for links" do
+      render_inline Admin::ActionComponent.new(:edit, double, path: "/")
+
+      expect(page).not_to have_css "[data-disable-with]"
+    end
+
+    it "is rendered for buttons" do
+      render_inline Admin::ActionComponent.new(:hide, double, path: "/", method: :delete)
+
+      expect(page).to have_css "button[data-disable-with='Hide']"
+    end
+  end
 end