diff --git a/app/components/debates/new_component.html.erb b/app/components/debates/new_component.html.erb
new file mode 100644
index 000000000..d3618205e
--- /dev/null
+++ b/app/components/debates/new_component.html.erb
@@ -0,0 +1,30 @@
+<div class="debate-new">
+
+  <div class="small-12 medium-9 column">
+    <%= back_link_to debates_path %>
+
+    <h1><%= t("debates.new.start_new") %></h1>
+    <div data-alert class="callout primary">
+      <%= sanitize(t("debates.new.info",
+      info_link: link_to(t("debates.new.info_link"), new_proposal_path))) %>
+
+      <% if feature?(:help_page) %>
+        <%= link_to help_path, title: t("shared.target_blank"), target: "_blank" do %>
+          <strong><%= t("debates.new.more_info") %></strong>
+        <% end %>
+      <% end %>
+    </div>
+    <%= render Debates::FormComponent.new(debate) %>
+  </div>
+
+  <div class="small-12 medium-3 column">
+    <span class="icon-debates float-right"></span>
+    <h2><%= t("debates.new.recommendations_title") %></h2>
+    <ul class="recommendations">
+      <li><%= t("debates.new.recommendation_one") %></li>
+      <li><%= t("debates.new.recommendation_two") %></li>
+      <li><%= t("debates.new.recommendation_three") %></li>
+      <li><%= t("debates.new.recommendation_four") %></li>
+    </ul>
+  </div>
+</div>
diff --git a/app/components/debates/new_component.rb b/app/components/debates/new_component.rb
new file mode 100644
index 000000000..2b0ac9787
--- /dev/null
+++ b/app/components/debates/new_component.rb
@@ -0,0 +1,7 @@
+class Debates::NewComponent < ApplicationComponent
+  attr_reader :debate
+
+  def initialize(debate)
+    @debate = debate
+  end
+end
diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb
index f7da8c74c..d798c7b8b 100644
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -1,30 +1 @@
-<div class="debate-new">
-
-  <div class="small-12 medium-9 column">
-    <%= back_link_to debates_path %>
-
-    <h1><%= t("debates.new.start_new") %></h1>
-    <div data-alert class="callout primary">
-      <%= sanitize(t("debates.new.info",
-      info_link: link_to(t("debates.new.info_link"), new_proposal_path))) %>
-
-      <% if feature?(:help_page) %>
-        <%= link_to help_path, title: t("shared.target_blank"), target: "_blank" do %>
-          <strong><%= t("debates.new.more_info") %></strong>
-        <% end %>
-      <% end %>
-    </div>
-    <%= render "form" %>
-  </div>
-
-  <div class="small-12 medium-3 column">
-    <span class="icon-debates float-right"></span>
-    <h2><%= t("debates.new.recommendations_title") %></h2>
-    <ul class="recommendations">
-      <li><%= t("debates.new.recommendation_one") %></li>
-      <li><%= t("debates.new.recommendation_two") %></li>
-      <li><%= t("debates.new.recommendation_three") %></li>
-      <li><%= t("debates.new.recommendation_four") %></li>
-    </ul>
-  </div>
-</div>
+<%= render Debates::NewComponent.new(@debate) %>