diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb
index 6e401af0a6..b870f9c985 100644
--- a/app/helpers/order_cycles_helper.rb
+++ b/app/helpers/order_cycles_helper.rb
@@ -3,6 +3,10 @@ module OrderCyclesHelper
     @current_order_cycle ||= current_order(false).andand.order_cycle
   end
 
+  def order_cycle_permitted_in(enterprises)
+    enterprises.merge(order_cycle_permitted_enterprises)
+  end
+
   def order_cycle_permitted_enterprises
     OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises
   end
diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml
index de18679cf6..8c7ce2bbbd 100644
--- a/app/views/admin/order_cycles/_row.html.haml
+++ b/app/views/admin/order_cycles/_row.html.haml
@@ -7,13 +7,24 @@
 
   - unless order_cycles_simple_index
     %td.suppliers
-      - order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s|
-        = s.name
-        %br/
+      - suppliers = order_cycle_permitted_in(order_cycle.suppliers)
+      - supplier_list = suppliers.map(&:name).sort.join ', '
+      - if suppliers.count > 3
+        %span.with-tip{'data-powertip' => supplier_list}
+          = suppliers.count
+          suppliers
+      - else
+        = supplier_list
     %td= order_cycle.coordinator.name
     %td.distributors
-      - order_cycle.distributors.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |d|
-        = d.name
+      - distributors = order_cycle_permitted_in(order_cycle.distributors)
+      - distributor_list = distributors.map(&:name).sort.join ', '
+      - if distributors.count > 3
+        %span.with-tip{'data-powertip' => distributor_list}
+          = distributors.count
+          distributors
+      - else
+        = distributor_list
         %br/
 
   %td.products
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index c84a6d65c7..b1ad3a8843 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -85,6 +85,7 @@ feature %q{
     fill_in 'order_cycle_name', with: 'Plums & Avos'
     fill_in 'order_cycle_orders_open_at', with: '2012-11-06 06:00:00'
     fill_in 'order_cycle_orders_close_at', with: '2012-11-13 17:00:00'
+    select 'My coordinator', from: 'order_cycle_coordinator_id'
 
     # And I add a coordinator fee
     click_button 'Add coordinator fee'