diff --git a/app/components/admin/geozones/index_component.html.erb b/app/components/admin/geozones/index_component.html.erb
new file mode 100644
index 000000000..5ed12f1c1
--- /dev/null
+++ b/app/components/admin/geozones/index_component.html.erb
@@ -0,0 +1,29 @@
+<%= header do %>
+  <%= link_to t("admin.geozones.index.create"), new_admin_geozone_path %>
+<% end %>
+
+<table>
+  <thead>
+    <tr>
+      <th><%= t("admin.geozones.geozone.name") %></th>
+      <th><%= t("admin.geozones.geozone.external_code") %></th>
+      <th><%= t("admin.geozones.geozone.census_code") %></th>
+      <th><%= t("admin.geozones.geozone.coordinates") %></th>
+      <th><%= t("admin.actions.actions") %></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% geozones.each do |geozone| %>
+      <tr id="<%= dom_id(geozone) %>">
+        <td><%= geozone.name %></td>
+        <td><%= geozone.external_code %></td>
+        <td><%= geozone.census_code %></td>
+        <td class="break"><%= geozone.html_map_coordinates %></td>
+        <td>
+          <%= render Admin::TableActionsComponent.new(geozone) %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/components/admin/geozones/index_component.rb b/app/components/admin/geozones/index_component.rb
new file mode 100644
index 000000000..4701c84b8
--- /dev/null
+++ b/app/components/admin/geozones/index_component.rb
@@ -0,0 +1,14 @@
+class Admin::Geozones::IndexComponent < ApplicationComponent
+  include Header
+  attr_reader :geozones
+
+  def initialize(geozones)
+    @geozones = geozones
+  end
+
+  private
+
+    def title
+      t("admin.geozones.index.title")
+    end
+end
diff --git a/app/views/admin/geozones/index.html.erb b/app/views/admin/geozones/index.html.erb
index c8dabf366..105224725 100644
--- a/app/views/admin/geozones/index.html.erb
+++ b/app/views/admin/geozones/index.html.erb
@@ -1,30 +1 @@
-<%= link_to t("admin.geozones.index.create"),
-              new_admin_geozone_path, class: "button float-right" %>
-
-<h2 class="inline-block"><%= t("admin.geozones.index.title") %></h2>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t("admin.geozones.geozone.name") %></th>
-      <th><%= t("admin.geozones.geozone.external_code") %></th>
-      <th><%= t("admin.geozones.geozone.census_code") %></th>
-      <th><%= t("admin.geozones.geozone.coordinates") %></th>
-      <th><%= t("admin.actions.actions") %></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @geozones.each do |geozone| %>
-      <tr id="<%= dom_id(geozone) %>">
-        <td><%= geozone.name %></td>
-        <td><%= geozone.external_code %></td>
-        <td><%= geozone.census_code %></td>
-        <td class="break"><%= geozone.html_map_coordinates %></td>
-        <td>
-          <%= render Admin::TableActionsComponent.new(geozone) %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= render Admin::Geozones::IndexComponent.new(@geozones) %>