diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index 8802d1c9b2d..4d7cf58049c 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -18,7 +18,7 @@
     <h3>{{i18n 'flagging.notify_staff'}}</h3>
   {{/if}}
 {{else}}
-  <div class='controls'>
+  <div class="controls {{flag.name_key}}">
     <label class='radio'>
       <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
       <div class='flag-action-type-details'>
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index d7c2ef58feb..06acfc0c4f5 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -54,17 +54,16 @@ class SiteSerializer < ApplicationSerializer
 
   def post_action_types
     cache_fragment("post_action_types_#{I18n.locale}") do
-      types = PostActionType.types.values.map { |id| PostActionType.new(id: id) }
+      types = ordered_flags(PostActionType.types.values)
       ActiveModel::ArraySerializer.new(types).as_json
     end
   end
 
   def topic_flag_types
     cache_fragment("post_action_flag_types_#{I18n.locale}") do
-      types = PostActionType.topic_flag_types.values.map { |id| PostActionType.new(id: id) }
+      types = ordered_flags(PostActionType.topic_flag_types.values)
       ActiveModel::ArraySerializer.new(types, each_serializer: TopicFlagTypeSerializer).as_json
     end
-
   end
 
   def default_archetype
@@ -163,4 +162,16 @@ class SiteSerializer < ApplicationSerializer
     scope.can_create_shared_draft?
   end
 
+  private
+
+  def ordered_flags(flags)
+    notify_moderators_type = PostActionType.flag_types[:notify_moderators]
+    types = flags
+
+    if notify_moderators_flag = types.index(notify_moderators_type)
+      types.insert(types.length, types.delete_at(notify_moderators_flag))
+    end
+
+    types.map { |id| PostActionType.new(id: id) }
+  end
 end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 958e608df3d..228b1119fb5 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -127,8 +127,7 @@ class Plugin::Instance
   end
 
   # Applies to all sites in a multisite environment. Ignores plugin.enabled?
-  def replace_flags
-    settings = ::FlagSettings.new
+  def replace_flags(settings: ::FlagSettings.new)
     yield settings
 
     reloadable_patch do |plugin|