diff --git a/app/views/admin/order_cycles/_coordinator_fees.html.haml b/app/views/admin/order_cycles/_coordinator_fees.html.haml
new file mode 100644
index 0000000000..338fadb435
--- /dev/null
+++ b/app/views/admin/order_cycles/_coordinator_fees.html.haml
@@ -0,0 +1,5 @@
+%table.coordinator-fees
+  %tr{'ng-repeat' => 'enterprise_fee in order_cycle.coordinator_fees'}
+    %td= select_tag 'order_cycle_coordinator_fee_{{ $index }}_id', nil, {'ng-model' => 'enterprise_fee.id', 'ng-options' => 'enterprise_fee.id as enterprise_fee.name for enterprise_fee in enterpriseFeesForEnterprise(order_cycle.coordinator_id)'}
+    %td= link_to 'Remove', '#', {'id' => 'order_cycle_coordinator_fee_{{ $index }}_remove', 'ng-click' => 'removeCoordinatorFee($event, $index)'}
+= f.submit 'Add coordinator fee', 'ng-click' => 'addCoordinatorFee($event)'
diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index ba19166a46..64190c525b 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -31,12 +31,7 @@
 %h2 Coordinator
 = f.label :coordinator_id, 'Coordinator'
 = f.collection_select :coordinator_id, coordinating_enterprises, :id, :name, {}, {'ng-model' => 'order_cycle.coordinator_id', 'ofw-on-change' => 'order_cycle.coordinator_fees = []', 'required' => true}
-
-%table.coordinator-fees
-  %tr{'ng-repeat' => 'enterprise_fee in order_cycle.coordinator_fees'}
-    %td= select_tag 'order_cycle_coordinator_fee_{{ $index }}_id', nil, {'ng-model' => 'enterprise_fee.id', 'ng-options' => 'enterprise_fee.id as enterprise_fee.name for enterprise_fee in enterpriseFeesForEnterprise(order_cycle.coordinator_id)'}
-    %td= link_to 'Remove', '#', {'id' => 'order_cycle_coordinator_fee_{{ $index }}_remove', 'ng-click' => 'removeCoordinatorFee($event, $index)'}
-= f.submit 'Add coordinator fee', 'ng-click' => 'addCoordinatorFee($event)'
+= render 'coordinator_fees', f: f
 
 
 %h2 Outgoing