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
@@ -42,6 +42,26 @@ c.template_context['visual']['default_re
 
         ## JAVASCRIPT
         <%def name="js()">
+            <script>
+                // setup Polymer options
+                window.Polymer = {lazyRegister: true, dom: 'shadow'};
+
+                // load webcomponents polyfills
+                (function() {
+                    if ('registerElement' in document
+                            && 'import' in document.createElement('link')
+                            && 'content' in document.createElement('template')) {
+                        // browser has web components
+                    } else {
+                        // polyfill web components
+                        var e = document.createElement('script');
+                        e.src = '${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}';
+                        document.head.appendChild(e);
+                    }
+                })();
+            </script>
+            <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}" async>
+
             <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
             <script type="text/javascript">
             // register templateContext to pass template variables to JS
@@ -82,25 +102,6 @@ c.template_context['visual']['default_re
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
             <![endif]-->
-            <script>
-                // setup Polymer options
-                window.Polymer = {lazyRegister: true, dom: 'shadow'};
-
-                // load webcomponents polyfills
-                (function() {
-                    if ('registerElement' in document
-                            && 'import' in document.createElement('link')
-                            && 'content' in document.createElement('template')) {
-                        // browser has web components
-                    } else {
-                        // polyfill web components
-                        var e = document.createElement('script');
-                        e.src = '${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}';
-                        document.head.appendChild(e);
-                    }
-                })();
-            </script>
-            <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
             <script language="javascript" type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
             ## avoide escaping the %N