diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
index 6558c789a2..688bf45a99 100644
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -1,16 +1,14 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, longDescription, Enterprise, PaymentMethods, ShippingMethods, NavigationCheck) ->
+  .controller "enterpriseCtrl", ($scope, longDescription, Enterprise, PaymentMethods, ShippingMethods) ->
     $scope.Enterprise = Enterprise.enterprise
     $scope.PaymentMethods = PaymentMethods.paymentMethods
     $scope.ShippingMethods = ShippingMethods.shippingMethods
     # htmlVariable is used by textAngular wysiwyg for the long descrtiption.
     $scope.htmlVariable = longDescription
     # Provide a callback for a warning message displayed when leaving the page.
-    navigationCallback = ->
+    $scope.navigationCallback = ->
       "You are editing an enterprise!"
 
-    NavigationCheck.register navigationCallback
-
     for payment_method in $scope.PaymentMethods
       payment_method.selected = payment_method.id in $scope.Enterprise.payment_method_ids
 
diff --git a/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee b/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee
new file mode 100644
index 0000000000..26964a677d
--- /dev/null
+++ b/app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee
@@ -0,0 +1,4 @@
+angular.module("admin.utils").directive "navigationCheck", (NavigationCheck)->
+  link: ($scope) ->
+    # Define navigationCallback on the controller.
+    NavigationCheck.register($scope.navigationCallback)
diff --git a/app/views/admin/enterprises/_ng_form.html.haml b/app/views/admin/enterprises/_ng_form.html.haml
index 18e9d6ed36..74b4347f16 100644
--- a/app/views/admin/enterprises/_ng_form.html.haml
+++ b/app/views/admin/enterprises/_ng_form.html.haml
@@ -3,7 +3,7 @@
 = admin_inject_payment_methods
 = admin_inject_shipping_methods
 
-.sixteen.columns.alpha{ ng: { app: 'admin.enterprises', controller: 'enterpriseCtrl' } }
+.sixteen.columns.alpha{ ng: { app: 'admin.enterprises', controller: 'enterpriseCtrl' }, "navigation-check" => "" }
   .eleven.columns.alpha
     = render 'form', f: f
   .one.column  
diff --git a/app/views/admin/enterprises/index.html.haml b/app/views/admin/enterprises/index.html.haml
index 03e5335155..b2a215b1c6 100644
--- a/app/views/admin/enterprises/index.html.haml
+++ b/app/views/admin/enterprises/index.html.haml
@@ -8,7 +8,7 @@
 
 = render 'admin/shared/enterprises_sub_menu'
 
-= form_for @enterprise_set, :url => main_app.bulk_update_admin_enterprises_path do |f|
+= form_for @enterprise_set, url: main_app.bulk_update_admin_enterprises_path do |f|
   %table#listing_enterprises.index
     %colgroup
       %col{style: "width: 25%;"}/