diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
new file mode 100644
index 00000000000..5a39cd4cc92
--- /dev/null
+++ b/app/assets/javascripts/ember_jquery.js
@@ -0,0 +1,2 @@
+//= require jquery_include.js
+//= require ember_include.js
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 1a52785b5f4..273d180340a 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -3,8 +3,6 @@
 //= require probes.js
 
 //= require handlebars.js
-//= require jquery_include.js
-//= require ember_include.js
 //= require i18n-patches
 
 //= require loader
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 65cf09b5350..8a5d7c7caa9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -20,6 +20,7 @@
 
     <%= script "preload_store" %>
     <%= script "locales/#{I18n.locale}" %>
+    <%= script "ember_jquery" %>
     <%= script "vendor" %>
     <%= script "application" %>
     <%- if staff? %>