diff --git a/app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee
index 887bece5b0..ef3cee9f68 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee
@@ -1,2 +1,3 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope) ->
+angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $controller) ->
+  $controller('AdminEditOrderCycleCtrl', {$scope: $scope})
   $scope.view = 'incoming'
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/outgoing_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/outgoing_controller.js.coffee
index b1dea40164..cd614534af 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/outgoing_controller.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/outgoing_controller.js.coffee
@@ -1,2 +1,3 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleOutgoingCtrl', ($scope) ->
+angular.module('admin.orderCycles').controller 'AdminOrderCycleOutgoingCtrl', ($scope, $controller) ->
+  $controller('AdminEditOrderCycleCtrl', {$scope: $scope})
   $scope.view = 'outgoing'
diff --git a/app/views/admin/order_cycles/incoming.html.haml b/app/views/admin/order_cycles/incoming.html.haml
index 9511b5c943..fdfa7c33f1 100644
--- a/app/views/admin/order_cycles/incoming.html.haml
+++ b/app/views/admin/order_cycles/incoming.html.haml
@@ -2,10 +2,9 @@
   = t :edit_order_cycle
 
 = admin_inject_order_cycle_instance
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminEditOrderCycleCtrl', name: 'order_cycle_form'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleIncomingCtrl', name: 'order_cycle_form'} do |f|
 
-  %div{ 'ng-controller' => 'AdminOrderCycleIncomingCtrl' }
-    = render 'wizard_progress'
+  = render 'wizard_progress'
 
   %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
     %input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.edit_admin_order_cycle_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
diff --git a/app/views/admin/order_cycles/outgoing.html.haml b/app/views/admin/order_cycles/outgoing.html.haml
index c34cb7e784..e56587ffa1 100644
--- a/app/views/admin/order_cycles/outgoing.html.haml
+++ b/app/views/admin/order_cycles/outgoing.html.haml
@@ -2,10 +2,9 @@
   = t :edit_order_cycle
 
 = admin_inject_order_cycle_instance
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminEditOrderCycleCtrl', name: 'order_cycle_form'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleOutgoingCtrl', name: 'order_cycle_form'} do |f|
 
-  %div{ 'ng-controller' => 'AdminOrderCycleOutgoingCtrl' }
-    = render 'wizard_progress'
+  = render 'wizard_progress'
 
   %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
     %input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }