diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index 776e16140e..78e83a2dde 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -25,6 +25,12 @@
 </a>
 </div>
 
+{% include 'modals.html' %}
+
+{% endblock %}
+
+{% block javascript %}
+
 <script type="text/javascript" src="{% static 'script/delay.js' %}"></script>
 <script type="text/javascript" src="{% static 'script/filter_company.js' %}">
 </script>
diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html
index 82fb30bdef..18fd806a9c 100644
--- a/InvenTree/company/templates/company/partdetail.html
+++ b/InvenTree/company/templates/company/partdetail.html
@@ -34,8 +34,7 @@
 <button class="btn btn-danger" id='part-delete'>Delete supplier part</button>
 </div>
 
-{% include 'modal.html' %}
-{% include 'modal_delete.html' %}
+{% include 'modals.html' %}
 
 {% endblock %}
 
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 957813a27a..ce1c6bcd9d 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -11,8 +11,7 @@
 
 {% include 'part/tabs.html' with tab='bom' %}
 
-{% include 'modal.html' %}
-{% include 'modal_delete.html' %}
+{% include 'modals.html' %}
 
 <h3>Bill of Materials</h3>
 
diff --git a/InvenTree/part/templates/part/category_detail.html b/InvenTree/part/templates/part/category_detail.html
index 20e154dd8d..9b12cab55f 100644
--- a/InvenTree/part/templates/part/category_detail.html
+++ b/InvenTree/part/templates/part/category_detail.html
@@ -31,8 +31,7 @@
 
 </div>
 
-{% include 'modal.html' %}
-{% include 'modal_delete.html' %}
+{% include 'modals.html' %}
 
 {% endblock %}
 
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 687f241b54..33d2ec573f 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -6,8 +6,7 @@
 
 <h3>Part Details</h3>
 
-{% include 'modal.html' %}
-{% include 'modal_delete.html' %}
+{% include 'modals.html' %}
 
 <table class='table table-striped'>
 <tr>
diff --git a/InvenTree/part/templates/part/index.html b/InvenTree/part/templates/part/index.html
index fb6ac2da57..1a281b731a 100644
--- a/InvenTree/part/templates/part/index.html
+++ b/InvenTree/part/templates/part/index.html
@@ -5,7 +5,7 @@
 
 {% include "part/cat_link.html" with category=category %}
 
-{% include 'modal.html' %}
+{% include 'modals.html' %}
 
 {% if children.all|length > 0 %}
 <h4>Part Categories</h4>
diff --git a/InvenTree/part/templates/part/supplier.html b/InvenTree/part/templates/part/supplier.html
index bef5ca496c..5265ea14f1 100644
--- a/InvenTree/part/templates/part/supplier.html
+++ b/InvenTree/part/templates/part/supplier.html
@@ -35,7 +35,7 @@
 <button class="btn btn-success" id='supplier-create'>New Supplier Part</button>
 </div>
 
-{% include 'modal.html' %}
+{% include 'modals.html' %}
 
 {% endblock %}
 
diff --git a/InvenTree/templates/modal.html b/InvenTree/templates/modal.html
deleted file mode 100644
index 451ee03bd0..0000000000
--- a/InvenTree/templates/modal.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-form'>
-    <div class='modal-dialog'>
-        <div class='modal-content'>
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <h3 id='modal-title'>Form Title Here</h3>
-            </div>
-            <div class='modal-form-content'>
-            </div>
-            <div class='modal-footer'>
-                <button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
-                <button type='button' class='btn btn-primary' id='modal-form-submit'>Submit</button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/InvenTree/templates/modal_delete.html b/InvenTree/templates/modals.html
similarity index 53%
rename from InvenTree/templates/modal_delete.html
rename to InvenTree/templates/modals.html
index 9ac774852f..d229c29215 100644
--- a/InvenTree/templates/modal_delete.html
+++ b/InvenTree/templates/modals.html
@@ -1,3 +1,22 @@
+<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-form'>
+    <div class='modal-dialog'>
+        <div class='modal-content'>
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+              <h3 id='modal-title'>Form Title Here</h3>
+            </div>
+            <div class='modal-form-content'>
+            </div>
+            <div class='modal-footer'>
+                <button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
+                <button type='button' class='btn btn-primary' id='modal-form-submit'>Submit</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-delete'>
     <div class='modal-dialog'>
         <div class='modal-content'>