diff --git a/superset/templates/superset/base.html b/superset/templates/superset/base.html
index 500ed0f87aeda..f974348b841a6 100644
--- a/superset/templates/superset/base.html
+++ b/superset/templates/superset/base.html
@@ -8,11 +8,15 @@
     {% endfor %}
   {% endblock %}
 
-  {% block tail_js %}
+  {% block head_js %}
     {{super()}}
     {% for entry in js_manifest('theme') %}
       <script src="{{ entry }}"></script>
     {% endfor %}
+  {% endblock %}
+
+  {% block tail_js %}
+    {{super()}}
     {% for entry in js_manifest('common') %}
       <script src="{{ entry }}"></script>
     {% endfor %}