diff --git a/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.html b/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.html
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.html
@@ -0,0 +1,7 @@
+<link rel="import" href="../../../../../../bower_components/polymer/polymer.html">
+<dom-module id="rhodecode-legacy-js">
+    <template>
+        <script src="../../../scripts.js"></script>
+    </template>
+    <script src="rhodecode-legacy-js.js"></script>
+</dom-module>
diff --git a/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.js b/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.js
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/src/components/rhodecode-legacy-js/rhodecode-legacy-js.js
@@ -0,0 +1,3 @@
+Polymer({
+    is: 'rhodecode-legacy-js',
+});
diff --git a/rhodecode/public/js/src/components/shared-components.html b/rhodecode/public/js/src/components/shared-components.html
--- a/rhodecode/public/js/src/components/shared-components.html
+++ b/rhodecode/public/js/src/components/shared-components.html
@@ -1,8 +1,9 @@
 <!-- required for stamped out templates that might use common elements  -->
+<link rel="import" href="rhodecode-legacy-js/rhodecode-legacy-js.html">
 <link rel="import" href="../../../../../bower_components/iron-ajax/iron-ajax.html">
 <link rel="import" href="shared-styles.html">
 <link rel="import" href="channelstream-connection/channelstream-connection.html">
 <link rel="import" href="rhodecode-toast/rhodecode-toast.html">
 <link rel="import" href="rhodecode-toggle/rhodecode-toggle.html">
 <link rel="import" href="rhodecode-unsafe-html/rhodecode-unsafe-html.html">
-<link rel="import" href="rhodecode-app/rhodecode-app.html">
\ No newline at end of file
+<link rel="import" href="rhodecode-app/rhodecode-app.html">
diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html
--- a/rhodecode/templates/base/root.html
+++ b/rhodecode/templates/base/root.html
@@ -119,10 +119,9 @@ c.template_context['visual']['default_re
             <![endif]-->
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
             <script> var alertMessagePayloads = ${h.flash.json_alerts()|n}; </script>
-            <script language="javascript" type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
             ## avoide escaping the %N
+            <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
             <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
-            <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
 
 
             ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -56,7 +56,7 @@ class TestHomeController(TestController)
 
         rhodecode_version_hash = c.rhodecode_version_hash
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
-        response.mustcontain('scripts.js?ver={0}'.format(rhodecode_version_hash))
+        response.mustcontain('rhodecode-components.js?ver={0}'.format(rhodecode_version_hash))
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()