diff --git a/app/components/admin/site_customization/pages/edit_component.html.erb b/app/components/admin/site_customization/pages/edit_component.html.erb
index f408bd9ef..81564f946 100644
--- a/app/components/admin/site_customization/pages/edit_component.html.erb
+++ b/app/components/admin/site_customization/pages/edit_component.html.erb
@@ -11,4 +11,4 @@
   ) %>
 <% end %>
 
-<%= render "form" %>
+<%= render Admin::SiteCustomization::Pages::FormComponent.new(page) %>
diff --git a/app/views/admin/site_customization/pages/_form.html.erb b/app/components/admin/site_customization/pages/form_component.html.erb
similarity index 87%
rename from app/views/admin/site_customization/pages/_form.html.erb
rename to app/components/admin/site_customization/pages/form_component.html.erb
index 36e65c54e..9fcabb9de 100644
--- a/app/views/admin/site_customization/pages/_form.html.erb
+++ b/app/components/admin/site_customization/pages/form_component.html.erb
@@ -1,7 +1,7 @@
-<%= render "shared/globalize_locales", resource: @page %>
+<%= render "shared/globalize_locales", resource: page %>
 
-<%= translatable_form_for [:admin, @page], html: { class: "edit_page" } do |f| %>
-  <%= render "shared/errors", resource: @page %>
+<%= translatable_form_for [:admin, page], html: { class: "site-customization-pages-form" } do |f| %>
+  <%= render "shared/errors", resource: page %>
 
   <div class="row">
     <div class="small-12 column">
diff --git a/app/components/admin/site_customization/pages/form_component.rb b/app/components/admin/site_customization/pages/form_component.rb
new file mode 100644
index 000000000..d503d0c79
--- /dev/null
+++ b/app/components/admin/site_customization/pages/form_component.rb
@@ -0,0 +1,9 @@
+class Admin::SiteCustomization::Pages::FormComponent < ApplicationComponent
+  include TranslatableFormHelper
+  include GlobalizeHelper
+  attr_reader :page
+
+  def initialize(page)
+    @page = page
+  end
+end
diff --git a/app/components/admin/site_customization/pages/new_component.html.erb b/app/components/admin/site_customization/pages/new_component.html.erb
index aee470c74..593b67142 100644
--- a/app/components/admin/site_customization/pages/new_component.html.erb
+++ b/app/components/admin/site_customization/pages/new_component.html.erb
@@ -3,4 +3,4 @@
 
 <%= header %>
 
-<%= render "form" %>
+<%= render Admin::SiteCustomization::Pages::FormComponent.new(page) %>