diff --git a/app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee b/app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee
new file mode 100644
index 0000000000..2e61048b31
--- /dev/null
+++ b/app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee
@@ -0,0 +1,32 @@
+angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
+  restrict: 'C'
+  link: (scope, element, attrs) ->
+    # Make variantAutocomplete do nothing because it is called
+    # from core/app/assets/javascripts/admin/orders/edit.js
+    $.fn.variantAutocomplete = angular.noop
+
+    $timeout ->
+      if $("#variant_autocomplete_template").length > 0
+        variantTemplate = Handlebars.compile($("#variant_autocomplete_template").text())
+
+      if Spree.routes
+        element.parent().children(".options_placeholder").attr "id", element.parent().data("index")
+        element.select2
+          placeholder: "Select a variant"
+          minimumInputLength: 3
+          ajax:
+            url: Spree.routes.variants_search
+            datatype: "json"
+            data: (term, page) ->
+              q: term
+              distributor_id: scope.distributor_id
+              order_cycle_id: scope.order_cycle_id
+            results: (data, page) ->
+              results: data
+          formatResult: (variant) ->
+            if variant["images"][0] != undefined && variant["images"][0].image != undefined
+              variant.image = variant.images[0].image.mini_url
+            variantTemplate variant: variant
+          formatSelection: (variant) ->
+            element.parent().children(".options_placeholder").html variant.options_text
+            variant.name
diff --git a/app/assets/javascripts/admin/variant_autocomplete_with_distribution_filter.js.coffee b/app/assets/javascripts/admin/variant_autocomplete_with_distribution_filter.js.coffee
deleted file mode 100644
index e3d66d5cd3..0000000000
--- a/app/assets/javascripts/admin/variant_autocomplete_with_distribution_filter.js.coffee
+++ /dev/null
@@ -1,30 +0,0 @@
-$(document).ready ->
-  if $("#variant_autocomplete_template").length > 0
-    window.variantTemplate = Handlebars.compile($("#variant_autocomplete_template").text())
-
-formatVariantResult = (variant) ->
-  if variant["images"][0] != undefined && variant["images"][0].image != undefined
-    variant.image = variant.images[0].image.mini_url
-  variantTemplate variant: variant
-
-$.fn.variantAutocomplete = ->
-  if Spree.routes
-    @parent().children(".options_placeholder").attr "id", @parent().data("index")
-    @select2
-      placeholder: "Select a variant"
-      minimumInputLength: 3
-      ajax:
-        url: Spree.routes.variants_search
-        datatype: "json"
-        data: (term, page) ->
-          q: term
-          distributor_id: $("#order_distributor_id").val()
-          order_cycle_id: $("#order_order_cycle_id").val()
-
-        results: (data, page) ->
-          results: data
-
-      formatResult: formatVariantResult
-      formatSelection: (variant) ->
-        $(@element).parent().children(".options_placeholder").html variant.options_text
-        variant.name