diff --git a/app/views/admin/settings/_featured_settings_form.html.erb b/app/components/admin/settings/featured_settings_form_component.html.erb
similarity index 88%
rename from app/views/admin/settings/_featured_settings_form.html.erb
rename to app/components/admin/settings/featured_settings_form_component.html.erb
index ea9c3732a..84b3c5f73 100644
--- a/app/views/admin/settings/_featured_settings_form.html.erb
+++ b/app/components/admin/settings/featured_settings_form_component.html.erb
@@ -1,5 +1,5 @@
 <%= form_for(feature, url: admin_setting_path(feature), html: { id: "edit_#{dom_id(feature)}" }) do |f| %>
-  <%= f.hidden_field :tab, value: tab if defined?(tab) %>
+  <%= f.hidden_field :tab, value: tab if tab %>
   <%= f.hidden_field :value, id: dom_id(feature), value: (feature.enabled? ? "" : "active") %>
   <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? "disable" : "enable"}"),
                class: "button expanded #{feature.enabled? ? "hollow alert" : "success"}",
diff --git a/app/components/admin/settings/featured_settings_form_component.rb b/app/components/admin/settings/featured_settings_form_component.rb
new file mode 100644
index 000000000..db2382678
--- /dev/null
+++ b/app/components/admin/settings/featured_settings_form_component.rb
@@ -0,0 +1,8 @@
+class Admin::Settings::FeaturedSettingsFormComponent < ApplicationComponent
+  attr_reader :feature, :tab
+
+  def initialize(feature, tab: nil)
+    @feature = feature
+    @tab = tab
+  end
+end
diff --git a/app/views/admin/settings/_featured_settings_table.html.erb b/app/views/admin/settings/_featured_settings_table.html.erb
index 8936b3cae..4bde70d30 100644
--- a/app/views/admin/settings/_featured_settings_table.html.erb
+++ b/app/views/admin/settings/_featured_settings_table.html.erb
@@ -32,7 +32,7 @@
         </td>
 
         <td class="text-right">
-          <%= render "admin/settings/featured_settings_form", feature: feature, tab: tab %>
+          <%= render Admin::Settings::FeaturedSettingsFormComponent.new(feature, tab: tab) %>
         </td>
       </tr>
     <% end %>