diff --git a/app/assets/javascripts/admin/addon/models/admin-plugin.js b/app/assets/javascripts/admin/addon/models/admin-plugin.js
index 3cf10b688c7..648202252c4 100644
--- a/app/assets/javascripts/admin/addon/models/admin-plugin.js
+++ b/app/assets/javascripts/admin/addon/models/admin-plugin.js
@@ -28,9 +28,11 @@ export default class AdminPlugin {
     this.authors = args.authors;
   }
 
-  get settingCategoryName() {
-    const snakeCaseName = this.name.replaceAll("-", "_");
+  get snakeCaseName() {
+    return this.name.replaceAll("-", "_");
+  }
 
+  get translatedCategoryName() {
     // We do this because the site setting list is grouped by category,
     // with plugins that have their root site setting key defined as `plugins:`
     // being grouped under the generic "plugins" category.
@@ -39,17 +41,26 @@ export default class AdminPlugin {
     // we can use that instead to go directly to the setting category.
     //
     // Over time, no plugins should be missing this data.
-    const translationAttempt = I18n.lookup(
-      `admin.site_settings.categories.${snakeCaseName}`
-    );
-    if (translationAttempt) {
-      return snakeCaseName;
+    return I18n.lookup(`admin.site_settings.categories.${this.snakeCaseName}`);
+  }
+
+  get settingCategoryName() {
+    if (this.translatedCategoryName) {
+      return this.snakeCaseName;
     }
 
     return "plugins";
   }
 
   get nameTitleized() {
+    // The category name is better in a lot of cases, as it's a human-inputted
+    // translation, and we can handle things like SAML instead of showing them
+    // as Saml from discourse-saml. We can fall back to the programattic version
+    // though if needed.
+    if (this.translatedCategoryName) {
+      return this.translatedCategoryName;
+    }
+
     return this.name
       .split("-")
       .map((word) => {
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings.hbs b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
index 4aba5d691ce..14ae9cfefe1 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
@@ -29,10 +29,15 @@
   </div>
 </div>
 
-<div class="admin-nav pull-left">
+<div class="admin-nav admin-site-settings-category-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each this.visibleSiteSettings as |category|}}
-      <li class={{category.nameKey}}>
+      <li
+        class={{concat-class
+          "admin-site-settings-category-nav__item"
+          category.nameKey
+        }}
+      >
         <LinkTo
           @route="adminSiteSettingsCategory"
           @model={{category.nameKey}}
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index f307cb1395d..364ce5812cb 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -77,14 +77,16 @@ class Plugin::Instance
   def self.find_all(parent_path)
     [].tap do |plugins|
       # also follows symlinks - http://stackoverflow.com/q/357754
-      Dir["#{parent_path}/*/plugin.rb"].sort.each do |path|
-        source = File.read(path)
-        metadata = Plugin::Metadata.parse(source)
-        plugins << self.new(metadata, path)
-      end
+      Dir["#{parent_path}/*/plugin.rb"].sort.each { |path| plugins << parse_from_source(path) }
     end
   end
 
+  def self.parse_from_source(path)
+    source = File.read(path)
+    metadata = Plugin::Metadata.parse(source)
+    self.new(metadata, path)
+  end
+
   def initialize(metadata = nil, path = nil)
     @metadata = metadata
     @path = path
diff --git a/spec/system/admin_plugins_list_spec.rb b/spec/system/admin_plugins_list_spec.rb
index 840b2856544..7006bf69abb 100644
--- a/spec/system/admin_plugins_list_spec.rb
+++ b/spec/system/admin_plugins_list_spec.rb
@@ -3,30 +3,34 @@
 describe "Admin Plugins List", type: :system, js: true do
   fab!(:current_user) { Fabricate(:admin) }
 
-  before { sign_in(current_user) }
-
-  let(:spoiler_alert_plugin) do
-    plugins = Plugin::Instance.find_all("#{Rails.root}/plugins")
-    plugins.find { |p| p.name == "spoiler-alert" }
+  before do
+    sign_in(current_user)
+    Discourse.stubs(:visible_plugins).returns([spoiler_alert_plugin])
   end
 
-  xit "shows the list of plugins" do
+  let(:spoiler_alert_plugin) do
+    path = File.join(Rails.root, "plugins", "spoiler-alert", "plugin.rb")
+    Plugin::Instance.parse_from_source(path)
+  end
+
+  it "shows the list of plugins" do
     visit "/admin/plugins"
 
-    plugin_row = find(".admin-plugins-list tr[data-plugin-name=\"spoiler-alert\"]")
+    plugin_row =
+      find(".admin-plugins-list tr[data-plugin-name=\"spoiler-alert\"] td.admin-plugins-list__row")
     expect(plugin_row).to have_css(
-      "td.admin-plugins-list__row .admin-plugins__name-with-badges .admin-plugins__name",
+      ".admin-plugins-list__name-with-badges .admin-plugins-list__name",
       text: "Spoiler Alert",
     )
     expect(plugin_row).to have_css(
-      "td.admin-plugins-list__row .admin-plugins__author",
+      ".admin-plugins-list__author",
       text: I18n.t("admin_js.admin.plugins.author", { author: "Discourse" }),
     )
     expect(plugin_row).to have_css(
-      "td.admin-plugins-list__row .admin-plugins__name-with-badges .admin-plugins__name a[href=\"https://meta.discourse.org/t/12650\"]",
+      ".admin-plugins-list__name-with-badges .admin-plugins-list__name a[href=\"https://meta.discourse.org/t/12650\"]",
     )
     expect(plugin_row).to have_css(
-      "td.admin-plugins-list__row .admin-plugins__about",
+      ".admin-plugins-list__about",
       text: spoiler_alert_plugin.metadata.about,
     )
   end