diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index 37efc90336..0e6f1753b8 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -4,6 +4,7 @@
 {% block css %}
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
+        <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery.tagit.css' %}">
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/core.css' %}" type="text/css" />
     {% endcompress %}
 
@@ -15,7 +16,7 @@
 {% endblock %}
 
 {% block js %}
-    
+
     {% compress js %}
         <script src="{% static 'wagtailadmin/js/vendor/jquery-1.10.3.js' %}"></script>
         <script src="{% static 'wagtailadmin/js/vendor/jquery-ui-1.10.3.js' %}"></script>
@@ -25,9 +26,10 @@
         <script src="{% static 'wagtailadmin/js/vendor/bootstrap-modal.js' %}"></script>
         <script src="{% static 'wagtailadmin/js/vendor/bootstrap-tab.js' %}"></script>
         <script src="{% static 'wagtailadmin/js/vendor/jquery.dlmenu.js' %}"></script>
+        <script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
         <script src="{% static 'wagtailadmin/js/core.js' %}"></script>
         {% main_nav_js %}
     {% endcompress %}
-    
+
     {% block extra_js %}{% endblock %}
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
index 1d5881d608..6a9a9fcc3a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
@@ -8,10 +8,6 @@
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/page-editor.css' %}" type="text/css" />
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/panels/rich-text.css' %}" type="text/css" />
 
-    {# we'll want tag-it included, for the benefit of any modals that use it, like images. #}
-    {# TODO: a method of injecting these sorts of things on demand when the modal is spawned #}
-    <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery.tagit.css' %}">
-
     {% hook_output 'insert_editor_css' %}
 {% endcompress %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 74a3dde95a..68e18e08bd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -13,7 +13,6 @@
 {% compress js %}
     <script src="{% static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/vendor/hallo.js' %}"></script>
-    <script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/vendor/mousetrap.min.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/expanding_formset.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html
deleted file mode 100644
index a147749ce1..0000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_css.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load compress static %}
-{% compress css %}
-    <link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery.tagit.css' %}">
-{% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_js.html
deleted file mode 100644
index 70a920a5d3..0000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/tag_field_js.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load compress static %}
-{% compress js %}
-    <script src="{% static 'wagtailadmin/js/vendor/tag-it.js' %}"></script>
-{% endcompress %}
-
-{% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
-<script>
-    $(function() {
-        $('#id_tags').tagit({
-            autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
-        });
-    });
-</script>
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index c70b19141d..848aebbdb0 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -2,14 +2,18 @@
 {% load i18n %}
 {% load wagtailimages_tags %}
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
-{% block extra_css %}
-    {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_css.html" %}
-{% endblock %}
 
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_js.html" %}
+
+    {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
+    <script>
+        $(function() {
+            $('#id_tags').tagit({
+                autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
+            });
+        });
+    </script>
 {% endblock %}
 
 {% block content %}
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index ba2a5c99f8..0e58d597c1 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -2,14 +2,18 @@
 {% load i18n %}
 {% load wagtailimages_tags %}
 {% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
-{% block extra_css %}
-    {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_css.html" %}
-{% endblock %}
 
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_js.html" %}
+
+    {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
+    <script>
+        $(function() {
+            $('#id_tags').tagit({
+                autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
+            });
+        });
+    </script>
 {% endblock %}
 
 {% block content %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index 9237ec1857..eb27e8f7e2 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -2,14 +2,18 @@
 {% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Add an image" %}{% endblock %}
-{% block extra_css %}
-    {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_css.html" %}
-{% endblock %}
 
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/shared/tag_field_js.html" %}
+
+    {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
+    <script>
+        $(function() {
+            $('#id_tags').tagit({
+                autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
+            });
+        });
+    </script>
 {% endblock %}
 
 {% block content %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 6a397ceb80..2a6235cbe6 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -4,8 +4,6 @@
 {% block extra_css %}
     {{ block.super }}
 
-    {% include "wagtailadmin/shared/tag_field_css.html" %}
-
     <!-- Focal point chooser -->
     <link rel="stylesheet" href="{% static 'wagtailimages/css/vendor/jquery.Jcrop.min.css' %}" type="text/css">
     {% compress css %}
@@ -16,7 +14,14 @@
 {% block extra_js %}
     {{ block.super }}
 
-    {% include "wagtailadmin/shared/tag_field_js.html" %}
+    {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
+    <script>
+        $(function() {
+            $('#id_tags').tagit({
+                autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
+            });
+        });
+    </script>
 
     <!-- Focal point chooser -->
     <script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
@@ -71,7 +76,7 @@
 
                 <div class="current-focal-point-indicator{% if not image.focal_point %} hidden{% endif %}"></div>
             </div>
-            
+
         </div>
         <div class="col2 ">
             {% if url_generator_enabled %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
index c4b662529d..3e009f6562 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
@@ -7,7 +7,6 @@
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailimages/css/add-multiple.css' %}" type="text/css" />
     {% endcompress %}
-    {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block content %}
@@ -18,7 +17,7 @@
         <div class="drop-zone">
             <p>{% trans "Drag and drop images into this area to upload immediately." %}</p>
             <p>{{ help_text }}
-            
+
             <form action="{% url 'wagtailimages:add_multiple' %}" method="POST" enctype="multipart/form-data">
                 <div class="replace-file-input">
                     <button class="bicolor icon icon-plus">{% trans "Or choose from your computer" %}</button>
@@ -50,7 +49,7 @@
                 <p class="status-msg failure">{% trans "Sorry, upload failed." %}</p>
                 <p class="status-msg update-success">{% trans "Image updated." %}</p>
                 <p class="status-msg failure error_messages"></p>
-            </div>            
+            </div>
         </li>
     </script>
 {% endblock %}