diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 49dee85e9..3839475d1 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -36,14 +36,14 @@ class CommentsController < ApplicationController
     Flag.flag(current_user, @comment)
     set_comment_flags(@comment)
 
-    render "comments/_refresh_flag_actions"
+    render "shared/_refresh_flag_actions", locals: { flaggable: @comment, divider: true }
   end
 
   def unflag
     Flag.unflag(current_user, @comment)
     set_comment_flags(@comment)
 
-    render "comments/_refresh_flag_actions"
+    render "shared/_refresh_flag_actions", locals: { flaggable: @comment, divider: true }
   end
 
   private
diff --git a/app/controllers/concerns/flag_actions.rb b/app/controllers/concerns/flag_actions.rb
index 797b94778..acbc96882 100644
--- a/app/controllers/concerns/flag_actions.rb
+++ b/app/controllers/concerns/flag_actions.rb
@@ -4,13 +4,13 @@ module FlagActions
   def flag
     Flag.flag(current_user, flaggable)
 
-    render "_refresh_flag_actions"
+    render "shared/_refresh_flag_actions", locals: { flaggable: flaggable }
   end
 
   def unflag
     Flag.unflag(current_user, flaggable)
 
-    render "_refresh_flag_actions"
+    render "shared/_refresh_flag_actions", locals: { flaggable: flaggable }
   end
 
   private
diff --git a/app/views/budgets/investments/_refresh_flag_actions.js.erb b/app/views/budgets/investments/_refresh_flag_actions.js.erb
deleted file mode 100644
index 96062f79c..000000000
--- a/app/views/budgets/investments/_refresh_flag_actions.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-App.Flaggable.update("<%= dom_id(@investment) %>", "<%= j render("shared/flag_actions", flaggable: @investment) %>")
diff --git a/app/views/comments/_refresh_flag_actions.js.erb b/app/views/comments/_refresh_flag_actions.js.erb
deleted file mode 100644
index 991bb221e..000000000
--- a/app/views/comments/_refresh_flag_actions.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-App.Flaggable.update("<%= dom_id(@comment) %>", "<%= j render("shared/flag_actions", flaggable: @comment, divider: true) %>");
diff --git a/app/views/debates/_refresh_flag_actions.js.erb b/app/views/debates/_refresh_flag_actions.js.erb
deleted file mode 100644
index 297a9059b..000000000
--- a/app/views/debates/_refresh_flag_actions.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-App.Flaggable.update("<%= dom_id(@debate) %>", "<%= j render("shared/flag_actions", flaggable: @debate) %>");
diff --git a/app/views/legislation/proposals/_refresh_flag_actions.js.erb b/app/views/legislation/proposals/_refresh_flag_actions.js.erb
deleted file mode 100644
index 38cb6a3c4..000000000
--- a/app/views/legislation/proposals/_refresh_flag_actions.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-App.Flaggable.update("<%= dom_id(@proposal) %>", "<%= j render("shared/flag_actions", flaggable: @proposal) %>");
diff --git a/app/views/proposals/_refresh_flag_actions.js.erb b/app/views/proposals/_refresh_flag_actions.js.erb
deleted file mode 100644
index e60ee63b7..000000000
--- a/app/views/proposals/_refresh_flag_actions.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-App.Flaggable.update("<%= dom_id(@proposal) %>", "<%= j render("shared/flag_actions", flaggable: @proposal) %>")
diff --git a/app/views/shared/_refresh_flag_actions.js.erb b/app/views/shared/_refresh_flag_actions.js.erb
new file mode 100644
index 000000000..94aa42086
--- /dev/null
+++ b/app/views/shared/_refresh_flag_actions.js.erb
@@ -0,0 +1,3 @@
+App.Flaggable.update("<%= dom_id(flaggable) %>",
+  "<%= j render("shared/flag_actions", flaggable: flaggable, divider: local_assigns[:divider]) %>"
+);