diff --git a/app/views/moderation/users/index.html.erb b/app/views/moderation/users/index.html.erb
index c8b13b6e4..87b5b2dd5 100644
--- a/app/views/moderation/users/index.html.erb
+++ b/app/views/moderation/users/index.html.erb
@@ -17,8 +17,14 @@
           <% if user.hidden? %>
             <%= t("moderation.users.index.hidden") %>
           <% else %>
-            <%= link_to t("moderation.users.index.hide"), hide_in_moderation_screen_moderation_user_path(user, request.query_parameters),
-                        method: :put, class: "button hollow alert" %>
+            <%= render Admin::ActionComponent.new(
+              :hide_in_moderation_screen,
+              user,
+              text: t("moderation.users.index.hide"),
+              method: :put,
+              "aria-label": true,
+              class: "button hollow alert"
+            ) %>
           <% end %>
         </td>
       </tr>
diff --git a/spec/system/admin/activity_spec.rb b/spec/system/admin/activity_spec.rb
index f973b041b..a8e1bca8f 100644
--- a/spec/system/admin/activity_spec.rb
+++ b/spec/system/admin/activity_spec.rb
@@ -239,7 +239,7 @@ describe "Admin activity" do
       visit moderation_users_path(search: user.username)
 
       within("#moderation_users") do
-        click_link "Block"
+        click_button "Block"
       end
 
       visit admin_activity_path
diff --git a/spec/system/moderation/budget_investments_spec.rb b/spec/system/moderation/budget_investments_spec.rb
index aa0014182..6960fc1fc 100644
--- a/spec/system/moderation/budget_investments_spec.rb
+++ b/spec/system/moderation/budget_investments_spec.rb
@@ -75,7 +75,7 @@ describe "Moderate budget investments" do
           click_button "Search"
 
           within "tr", text: investment.author.name do
-            expect(page).to have_link "Block"
+            expect(page).to have_button "Block"
           end
         end
 
diff --git a/spec/system/moderation/comments_spec.rb b/spec/system/moderation/comments_spec.rb
index 27ca96c10..8321f2c2f 100644
--- a/spec/system/moderation/comments_spec.rb
+++ b/spec/system/moderation/comments_spec.rb
@@ -95,7 +95,7 @@ describe "Moderate comments" do
           click_button "Search"
 
           within "tr", text: comment.user.name do
-            expect(page).to have_link "Block"
+            expect(page).to have_button "Block"
           end
         end
 
diff --git a/spec/system/moderation/debates_spec.rb b/spec/system/moderation/debates_spec.rb
index 9a743807a..085682d53 100644
--- a/spec/system/moderation/debates_spec.rb
+++ b/spec/system/moderation/debates_spec.rb
@@ -66,7 +66,7 @@ describe "Moderate debates" do
           click_button "Search"
 
           within "tr", text: debate.author.name do
-            expect(page).to have_link "Block"
+            expect(page).to have_button "Block"
           end
         end
 
diff --git a/spec/system/moderation/proposal_notifications_spec.rb b/spec/system/moderation/proposal_notifications_spec.rb
index b81dba51c..6515c6566 100644
--- a/spec/system/moderation/proposal_notifications_spec.rb
+++ b/spec/system/moderation/proposal_notifications_spec.rb
@@ -70,7 +70,7 @@ describe "Moderate proposal notifications" do
           click_button "Search"
 
           within "tr", text: proposal_notification.author.name do
-            expect(page).to have_link "Block"
+            expect(page).to have_button "Block"
           end
         end
 
diff --git a/spec/system/moderation/proposals_spec.rb b/spec/system/moderation/proposals_spec.rb
index d2043d923..9ab06e314 100644
--- a/spec/system/moderation/proposals_spec.rb
+++ b/spec/system/moderation/proposals_spec.rb
@@ -65,7 +65,7 @@ describe "Moderate proposals" do
           click_button "Search"
 
           within "tr", text: proposal.author.name do
-            expect(page).to have_link "Block"
+            expect(page).to have_button "Block"
           end
         end
 
diff --git a/spec/system/moderation/users_spec.rb b/spec/system/moderation/users_spec.rb
index 9bf390005..3e54731bf 100644
--- a/spec/system/moderation/users_spec.rb
+++ b/spec/system/moderation/users_spec.rb
@@ -64,7 +64,7 @@ describe "Moderate users" do
     within("#moderation_users") do
       expect(page).to have_content citizen.name
       expect(page).not_to have_content "Blocked"
-      click_link "Block"
+      click_button "Block"
     end
 
     within("#moderation_users") do