diff --git a/app/views/registrar/domains/_domain.html.erb b/app/views/registrar/domains/_domain.html.erb
new file mode 100644
index 000000000..0cb020acb
--- /dev/null
+++ b/app/views/registrar/domains/_domain.html.erb
@@ -0,0 +1,10 @@
+<tr>
+    <td><%= link_to truncate(domain.name), info_registrar_domains_path(domain_name: domain.name) %></td>
+    <td><%= link_to domain.registrant, registrar_contact_path(id: domain.registrant.code) %></td>
+    <td><%= l(domain.valid_to, format: :date_long) %></td>
+    <td>
+        <%= link_to t(:edit), edit_registrar_domains_path(domain_name: domain.name), class: 'btn btn-primary btn-xs' %>
+        <%= link_to t(:renew), renew_registrar_domains_path(domain_name: domain.name), class: 'btn btn-default btn-xs' %>
+        <%= link_to t(:delete), delete_registrar_domains_path(domain_name: domain.name), class: 'btn btn-default btn-xs' %>
+    </td>
+</tr>
diff --git a/app/views/registrar/domains/index.html.erb b/app/views/registrar/domains/index.html.erb
index 83c0d5259..af220799b 100644
--- a/app/views/registrar/domains/index.html.erb
+++ b/app/views/registrar/domains/index.html.erb
@@ -99,24 +99,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <% @domains.each do |domain| %>
-                    <tr>
-                        <td>
-                            <%= link_to(truncate(domain.name), info_registrar_domains_path(domain_name: domain.name)) %>
-                        </td>
-                        <td>
-                            <%= link_to(domain.registrant, registrar_contact_path(id: domain.registrant.code)) %>
-                        </td>
-                        <td>
-                            <%= l(domain.valid_to, format: :date_long) %>
-                        </td>
-                        <td>
-                            <%= link_to(t(:edit), edit_registrar_domains_path(domain_name: domain.name), class: 'btn btn-primary btn-xs') %>
-                            <%= link_to(t(:renew), renew_registrar_domains_path(domain_name: domain.name), class: 'btn btn-default btn-xs') %>
-                            <%= link_to(t(:delete), delete_registrar_domains_path(domain_name: domain.name), class: 'btn btn-default btn-xs') %>
-                        </td>
-                    </tr>
-                <% end %>
+                    <%= render @domains %>
                 </tbody>
             </table>
         </div>