diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 269d57a20b..2ac56431d2 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -80,12 +80,8 @@
 
 {% endblock %}
 
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
-{% endblock %}
-
 {% block js_ready %}
-
+{{ block.super }}
     $("#edit-build").click(function () {
         launchModalForm("#modal-form",
                         "{% url 'build-edit' build.id %}",
diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html
index 2e3d7993bf..c79109a4b5 100644
--- a/InvenTree/build/templates/build/index.html
+++ b/InvenTree/build/templates/build/index.html
@@ -28,11 +28,8 @@
 
 {% endblock %}
 
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
-{% endblock %}
 {% block js_ready %}
-
+{{ block.super }}
     $("#new-build").click(function() {
         launchModalForm("#modal-form",
                         "{% url 'build-create' %}",
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 0b6ef06aac..c6f91c7a50 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -42,11 +42,6 @@
 </div>
 {% endif %}
 
-
-{% endblock %}
-
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
 {{ block.super }}
diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html
index 178c59ab9b..b36ec33eef 100644
--- a/InvenTree/company/templates/company/detail_part.html
+++ b/InvenTree/company/templates/company/detail_part.html
@@ -13,13 +13,8 @@
 <button class="btn btn-success" id='part-create'>New Supplier Part</button>
 </div>
 
-{% endblock %}
-
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
-
 {{ block.super }}
 
     $("#part-create").click(function () {
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 0409d13c73..e8698dc5e1 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -16,13 +16,9 @@
 
 {% include 'modals.html' %}
 
-{% endblock %}
-
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
-
+{{ block.super }}
     $('#new-company').click(function () {
         launchModalForm('#modal-form',
                         "{% url 'company-create' %}",
diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html
index 5afc9e8a6a..8642250726 100644
--- a/InvenTree/company/templates/company/partdetail.html
+++ b/InvenTree/company/templates/company/partdetail.html
@@ -38,10 +38,8 @@
 
 {% endblock %}
 
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
-{% endblock %}
 {% block js_ready %}
+{{ block.super }}
     $('#part-edit').click(function () {
         launchModalForm("#modal-form",
                         "{% url 'supplier-part-edit' part.id %}",
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 38389bfda2..b55879f507 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -18,13 +18,9 @@
     <button type='button' class='btn btn-success' id='new-bom-item'>Add BOM Item</button>
 </div>
 
-{% endblock %}
-
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
-
+{{ block.super }}
     function reloadBom() {
         $("#bom-table").bootstrapTable('refresh');
     }
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 8c622ff12a..f61b04b468 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -78,10 +78,6 @@
 
 {% endblock %}
 
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
-{% endblock %}
-
 {% block js_ready %}
 {{ block.super }}
     $("#part-thumb").click(function() {
diff --git a/InvenTree/static/script/modal_form.js b/InvenTree/static/script/inventree/modals.js
similarity index 100%
rename from InvenTree/static/script/modal_form.js
rename to InvenTree/static/script/inventree/modals.js
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 9b964ec63b..3594cd113b 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -129,10 +129,8 @@
 {% endif %}
 {% endblock %}
 
-{% block js_load %}
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
-{% endblock %}
 {% block js_ready %}
+{{ block.super }}
     $("#stock-edit").click(function () {
         launchModalForm("#modal-form",
                         "{% url 'stock-item-edit' item.id %}",
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index defb0c1828..3844e997c3 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -61,7 +61,6 @@
 {{ block.super }}
 <script type='text/javascript' src="{% static 'script/inventree/api.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/stock.js' %}"></script>
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 {% endblock %}
 {% block js_ready %}
 {{ block.super }}
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 32d928306b..c0ff673d57 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -65,7 +65,7 @@ InvenTree
 <script type='text/javascript' src="{% static 'script/sidenav.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/notification.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/jquery.form.min.js' %}"></script>
-<script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/inventree/modals.js' %}"></script>
 {% block js_load %}
 {% endblock %}