diff --git a/app/assets/javascripts/admin/resources/services/shipping_methods.js.coffee b/app/assets/javascripts/admin/resources/services/shipping_methods.js.coffee
new file mode 100644
index 0000000000..9fde8c9d06
--- /dev/null
+++ b/app/assets/javascripts/admin/resources/services/shipping_methods.js.coffee
@@ -0,0 +1,16 @@
+angular.module("admin.resources")
+  .factory "ShippingMethods", ($injector) ->
+    new class ShippingMethods
+      shippingMethods: []
+      byID: {}
+      pristineByID: {}
+
+      constructor: ->
+        if $injector.has('shippingMethods')
+          @load($injector.get('shippingMethods'))
+
+      load: (shippingMethods) ->
+        for shippingMethod in shippingMethods
+          @shippingMethods.push shippingMethod
+          @byID[shippingMethod.id] = shippingMethod
+          @pristineByID[shippingMethod.id] = angular.copy(shippingMethod)
diff --git a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
index 9efd2a5fea..c9b85ea76e 100644
--- a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
@@ -1,3 +1,3 @@
 angular.module("admin.shippingMethods").controller "shippingMethodsCtrl", ($scope, ShippingMethods) ->
   $scope.findShippingMethodByID = (id) ->
-    $scope.ShippingMethod = ShippingMethods.findByID(id)
+    $scope.ShippingMethod = ShippingMethods.byID[id]
diff --git a/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee b/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
deleted file mode 100644
index c691f5dae5..0000000000
--- a/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
+++ /dev/null
@@ -1,8 +0,0 @@
-angular.module("admin.shippingMethods")
-  .factory "ShippingMethods", (shippingMethods) ->
-    new class ShippingMethods
-      shippingMethods: shippingMethods
-
-      findByID: (id) ->
-        for shippingMethod in @shippingMethods
-          return shippingMethod if shippingMethod.id is id