diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index 60b294eba..230a7a115 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -32,7 +32,7 @@
 <h1>Devices</h1>
 <div class="row">
 	<div class="col-md-9">
-        {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:device_bulk_edit' bulk_delete_url='dcim:device_bulk_delete' %}
+        {% include 'dcim/inc/device_table.html' with bulk_edit_url='dcim:device_bulk_edit' bulk_delete_url='dcim:device_bulk_delete' %}
     </div>
     <div class="col-md-3">
 		<div class="panel panel-default">
diff --git a/netbox/templates/dcim/inc/device_table.html b/netbox/templates/dcim/inc/device_table.html
new file mode 100644
index 000000000..6b5034942
--- /dev/null
+++ b/netbox/templates/dcim/inc/device_table.html
@@ -0,0 +1,29 @@
+{% load render_table from django_tables2 %}
+{% load helpers %}
+{% if table.model|user_can_change:request.user or table.model|user_can_delete:request.user %}
+    <form method="post" class="form form-horizontal">
+        {% csrf_token %}
+        <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
+        {% render_table table table_template|default:'table.html' %}
+        {% if perms.dcim.add_interface %}
+            <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_add' %}" class="btn btn-primary btn-sm">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+                Add Interfaces
+            </button>
+        {% endif %}
+        {% if bulk_edit_url and table.model|user_can_change:request.user %}
+            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}" class="btn btn-warning btn-sm">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+                Edit Selected
+            </button>
+        {% endif %}
+        {% if bulk_delete_url and table.model|user_can_delete:request.user %}
+            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}" class="btn btn-danger btn-sm">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+                Delete Selected
+            </button>
+        {% endif %}
+    </form>
+{% else %}
+    {% render_table table table_template|default:'table.html' %}
+{% endif %}