diff --git a/app/views/admin/domains/_domain.html.erb b/app/views/admin/domains/_domain.html.erb
new file mode 100644
index 000000000..f0358784e
--- /dev/null
+++ b/app/views/admin/domains/_domain.html.erb
@@ -0,0 +1,16 @@
+<tr>
+    <td>
+        <%= link_to(domain, admin_domain_path(domain)) %>
+    </td>
+    <td>
+        <% if domain.registrant %>
+            <%= link_to(domain.registrant, [:admin, domain.registrant]) %>
+        <% end %>
+    </td>
+    <td>
+        <%= l(domain.valid_to, format: :short) %>
+    </td>
+    <td>
+        <%= link_to(domain.registrar, admin_registrar_path(domain.registrar)) if domain.registrar %>
+    </td>
+</tr>
diff --git a/app/views/admin/domains/index.html.erb b/app/views/admin/domains/index.html.erb
index 39199872e..17b47b4d0 100644
--- a/app/views/admin/domains/index.html.erb
+++ b/app/views/admin/domains/index.html.erb
@@ -29,24 +29,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <% @domains.each do |x| %>
-                    <tr>
-                        <td>
-                            <%= link_to(x, admin_domain_path(x)) %>
-                        </td>
-                        <td>
-                            <% if x.registrant %>
-                                <%= link_to(x.registrant, [:admin, x.registrant]) %>
-                            <% end %>
-                        </td>
-                        <td>
-                            <%= l(x.valid_to, format: :short) %>
-                        </td>
-                        <td>
-                            <%= link_to(x.registrar, admin_registrar_path(x.registrar)) if x.registrar %>
-                        </td>
-                    </tr>
-                <% end %>
+                    <%= render @domains %>
                 </tbody>
             </table>
         </div>