diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index e99f8b2c4..7472366c5 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -134,7 +134,7 @@
     {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
     </div>
 </div>
-{% include 'inc/modal.html' with modal_name='graphs' %}
+{% include 'inc/modal.html' with name='graphs' title='Graphs' %}
 {% endblock %}
 
 {% block javascript %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 624e8d9ef..5ab28b409 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -873,7 +873,7 @@
             {% endif %}
         </div>
     </div>
-{% include 'inc/modal.html' with modal_name='graphs' %}
+{% include 'inc/modal.html' with name='graphs' title='Graphs' %}
 {% include 'secrets/inc/private_key_modal.html' %}
 {% endblock %}
 
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index dfbf65aeb..5e26b9a22 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -288,7 +288,7 @@
         </div>
 	</div>
 </div>
-{% include 'inc/modal.html' with modal_name='graphs' %}
+{% include 'inc/modal.html' with name='graphs' title='Graphs' %}
 {% endblock %}
 
 {% block javascript %}
diff --git a/netbox/templates/inc/modal.html b/netbox/templates/inc/modal.html
index b70b9115f..7a2ff85c2 100644
--- a/netbox/templates/inc/modal.html
+++ b/netbox/templates/inc/modal.html
@@ -1,11 +1,15 @@
-<div class="modal fade" id="{{ modal_name }}_modal" tabindex="-1" role="dialog">
+<div class="modal fade" id="{{ name }}_modal" tabindex="-1" role="dialog">
     <div class="modal-dialog modal-lg" role="document">
         <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>
-                <h4 class="modal-title" id="{{ modal_name }}_modal_title">Modal title</h4>
+            {% if title %}
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">{{ title }}</h4>
+                </div>
+            {% endif %}
+            <div class="modal-body">
+                {{ content }}
             </div>
-            <div class="modal-body"></div>
         </div>
     </div>
 </div>