diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 28d25fbb0..0d886f771 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1811,8 +1811,11 @@ table {
   color: $delete;
 }
 
-.dropdown-pane a {
-  color: $text-medium;
+.dropdown-pane {
+  a,
+  button {
+    color: $text-medium;
+  }
 }
 
 // 17. Activity
diff --git a/app/views/shared/_flag_actions.html.erb b/app/views/shared/_flag_actions.html.erb
index b2b2e4566..49e58743f 100644
--- a/app/views/shared/_flag_actions.html.erb
+++ b/app/views/shared/_flag_actions.html.erb
@@ -8,7 +8,8 @@
       <span class="icon-flag flag-disable"></span>
     </button>
     <span class="dropdown-pane" id="flag-drop-<%= dom_id(flaggable) %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.flag"), polymorphic_path(flaggable, action: :flag), method: :put, remote: true %>
+      <%= button_to t("shared.flag"), polymorphic_path(flaggable, action: :flag),
+                    method: :put, remote: true %>
     </span>
   <% end %>
 
@@ -21,7 +22,8 @@
       <span class="icon-flag flag-active"></span>
     </button>
     <span class="dropdown-pane" id="unflag-drop-<%= dom_id(flaggable) %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.unflag"), polymorphic_path(flaggable, action: :unflag), method: :put, remote: true %>
+      <%= button_to t("shared.unflag"), polymorphic_path(flaggable, action: :unflag),
+                    method: :put, remote: true %>
     </span>
   <% end %>
 </span>
diff --git a/spec/shared/system/flaggable.rb b/spec/shared/system/flaggable.rb
index 899fb549f..dd07c81c9 100644
--- a/spec/shared/system/flaggable.rb
+++ b/spec/shared/system/flaggable.rb
@@ -27,18 +27,18 @@ shared_examples "flaggable" do |factory_name, admin: false|
 
     within "##{dom_id(flaggable)} .flag-content" do
       click_button "Flag as inappropriate"
-      click_link "Flag as inappropriate"
+      within("form") { click_button "Flag as inappropriate" }
 
       expect(page).to have_button "Unflag"
-      expect(page).to have_link "Unflag", visible: :hidden
-      expect(page).not_to have_link "Flag as inappropriate", visible: :all
+      expect(page).to have_button "Unflag", visible: :hidden
+      expect(page).not_to have_button "Flag as inappropriate", visible: :all
     end
 
     refresh
 
     within "##{dom_id(flaggable)} .flag-content" do
-      expect(page).to have_link "Unflag", visible: :hidden
-      expect(page).not_to have_link "Flag as inappropriate", visible: :all
+      expect(page).to have_button "Unflag", visible: :hidden
+      expect(page).not_to have_button "Flag as inappropriate", visible: :all
     end
   end
 
@@ -52,18 +52,18 @@ shared_examples "flaggable" do |factory_name, admin: false|
       expect(page).to have_button "Unflag"
 
       click_button "Unflag"
-      click_link "Unflag"
+      within("form") { click_button "Unflag" }
 
       expect(page).not_to have_button "Unflag"
-      expect(page).to have_link "Flag as inappropriate", visible: :hidden
-      expect(page).not_to have_link "Unflag", visible: :all
+      expect(page).to have_button "Flag as inappropriate", visible: :hidden
+      expect(page).not_to have_button "Unflag", visible: :all
     end
 
     visit path
 
     within "##{dom_id(flaggable)} .flag-content" do
-      expect(page).to have_link "Flag as inappropriate", visible: :hidden
-      expect(page).not_to have_link "Unflag", visible: :all
+      expect(page).to have_button "Flag as inappropriate", visible: :hidden
+      expect(page).not_to have_button "Unflag", visible: :all
     end
   end
 
@@ -73,12 +73,12 @@ shared_examples "flaggable" do |factory_name, admin: false|
 
     within "##{dom_id(flaggable)} .flag-content" do
       click_button "Flag as inappropriate"
-      click_link "Flag as inappropriate"
+      within("form") { click_button "Flag as inappropriate" }
 
       expect(page).to have_button "Unflag"
 
       click_button "Unflag"
-      click_link "Unflag"
+      within("form") { click_button "Unflag" }
 
       expect(page).not_to have_button "Unflag"
     end
@@ -86,8 +86,8 @@ shared_examples "flaggable" do |factory_name, admin: false|
     visit path
 
     within "##{dom_id(flaggable)} .flag-content" do
-      expect(page).to have_link "Flag as inappropriate", visible: :hidden
-      expect(page).not_to have_link "Unflag", visible: :all
+      expect(page).to have_button "Flag as inappropriate", visible: :hidden
+      expect(page).not_to have_button "Unflag", visible: :all
     end
   end
 
@@ -99,7 +99,7 @@ shared_examples "flaggable" do |factory_name, admin: false|
 
     within "##{dom_id(flaggable)} > .comment-body .flag-content" do
       click_button "Flag as inappropriate"
-      click_link "Flag as inappropriate"
+      within("form") { click_button "Flag as inappropriate" }
 
       expect(page).to have_button "Unflag"
     end