diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 5f61e03ba..84460a632 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -11,13 +11,15 @@ from utilities.tables import (
     TagColumn, ToggleColumn,
 )
 from .template_code import (
-    CABLETERMINATION, CONSOLEPORT_BUTTONS, DEVICE_LINK, INTERFACE_IPADDRESSES, INTERFACE_TAGGED_VLANS,
+    CABLETERMINATION, CONSOLEPORT_BUTTONS, CONSOLESERVERPORT_BUTTONS, DEVICE_LINK, INTERFACE_IPADDRESSES,
+    INTERFACE_TAGGED_VLANS,
 )
 
 __all__ = (
     'ConsolePortTable',
     'ConsoleServerPortTable',
     'DeviceConsolePortTable',
+    'DeviceConsoleServerPortTable',
     'DeviceImportTable',
     'DeviceTable',
     'DeviceBayTable',
@@ -272,6 +274,27 @@ class ConsoleServerPortTable(DeviceComponentTable, PathEndpointTable):
         default_columns = ('pk', 'device', 'name', 'label', 'type', 'description')
 
 
+class DeviceConsoleServerPortTable(ConsoleServerPortTable):
+    name = tables.TemplateColumn(
+        template_code='<i class="fa fa-keyboard-o"></i> <a href="{{ record.get_absolute_url }}">{{ value }}</a>'
+    )
+    actions = ButtonsColumn(
+        model=ConsoleServerPort,
+        buttons=('edit', 'delete'),
+        prepend_template=CONSOLESERVERPORT_BUTTONS
+    )
+
+    class Meta(DeviceComponentTable.Meta):
+        model = ConsoleServerPort
+        fields = (
+            'pk', 'name', 'label', 'type', 'description', 'cable', 'cable_peer', 'connection', 'tags', 'actions'
+        )
+        default_columns = ('pk', 'name', 'label', 'type', 'description', 'cable', 'cable_peer', 'actions')
+        row_attrs = {
+            'class': lambda record: record.cable.get_status_class() if record.cable else ''
+        }
+
+
 class PowerPortTable(DeviceComponentTable, PathEndpointTable):
     tags = TagColumn(
         url_name='dcim:powerport_list'
diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index e17a5a877..5e2b7e1c6 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -94,3 +94,20 @@ CONSOLEPORT_BUTTONS = """
     </span>
 {% endif %}
 """
+
+CONSOLESERVERPORT_BUTTONS = """
+{% if record.cable %}
+    {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
+{% elif perms.dcim.add_cable %}
+    <span class="dropdown">
+        <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
+        </button>
+        <ul class="dropdown-menu dropdown-menu-right">
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={{ device.get_absolute_url }}">Console Port</a></li>
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='front-port' %}?return_url={{ device.get_absolute_url }}">Front Port</a></li>
+            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='rear-port' %}?return_url={{ device.get_absolute_url }}">Rear Port</a></li>
+        </ul>
+    </span>
+{% endif %}
+"""
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 3cf011503..0de680420 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1029,6 +1029,10 @@ class DeviceView(ObjectView):
         ).prefetch_related(
             'cable', '_path__destination',
         )
+        consoleserverport_table = tables.DeviceConsoleServerPortTable(consoleserverports, orderable=False)
+        if request.user.has_perm('dcim.change_consoleserverport') or \
+                request.user.has_perm('dcim.delete_consoleserverport'):
+            consoleserverport_table.columns.show('pk')
 
         # Power ports
         powerports = PowerPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
@@ -1083,7 +1087,7 @@ class DeviceView(ObjectView):
         return render(request, 'dcim/device.html', {
             'device': device,
             'consoleport_table': consoleport_table,
-            'consoleserverports': consoleserverports,
+            'consoleserverport_table': consoleserverport_table,
             'powerports': powerports,
             'poweroutlets': poweroutlets,
             'interfaces': interfaces,
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 1a74016b2..962d1127f 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -134,7 +134,7 @@
                     <a href="#consoleports" role="tab" data-toggle="tab">Console Ports {% badge consoleport_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
-                    <a href="#consoleserverports" role="tab" data-toggle="tab">Console Server Ports {% badge consoleserverports|length %}</a>
+                    <a href="#consoleserverports" role="tab" data-toggle="tab">Console Server Ports {% badge consoleserverport_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
                     <a href="#powerports" role="tab" data-toggle="tab">Power Ports {% badge powerports|length %}</a>
@@ -707,29 +707,9 @@
                             <div class="panel-heading">
                                 <strong>Console Server Ports</strong>
                             </div>
-                            <table class="table table-hover table-headings panel-body component-list">
-                                <thead>
-                                    <tr>
-                                        {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
-                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                        {% endif %}
-                                        <th>Name</th>
-                                        <th>Type</th>
-                                        <th>Description</th>
-                                        <th>Cable</th>
-                                        <th colspan="2">Cable Termination</th>
-                                        <th colspan="2">Connection</th>
-                                        <th></th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {% for csp in consoleserverports %}
-                                        {% include 'dcim/inc/consoleserverport.html' %}
-                                    {% endfor %}
-                                </tbody>
-                            </table>
+                            {% include 'responsive_table.html' with table=consoleserverport_table %}
                             <div class="panel-footer noprint">
-                                {% if consoleserverports and perms.dcim.change_consoleport %}
+                                {% if perms.dcim.change_consoleport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                         <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -740,7 +720,7 @@
                                         <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if consoleserverports and perms.dcim.delete_consoleserverport %}
+                                {% if perms.dcim.delete_consoleserverport %}
                                     <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
                                         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                     </button>
@@ -751,8 +731,8 @@
                                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console server ports
                                         </a>
                                     </div>
-                                    <div class="clearfix"></div>
                                 {% endif %}
+                                <div class="clearfix"></div>
                             </div>
                         </div>
                     </form>
diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html
deleted file mode 100644
index 025b0bf02..000000000
--- a/netbox/templates/dcim/inc/consoleserverport.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% load helpers %}
-
-<tr class="consoleserverport{% if csp.cable %} {{ csp.cable.get_status_class }}{% endif %}">
-
-    {# Checkbox #}
-    {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
-        <td class="pk">
-            <input name="pk" type="checkbox" value="{{ csp.pk }}" />
-        </td>
-    {% endif %}
-
-    {# Name #}
-    <td>
-        <i class="fa fa-fw fa-keyboard-o"></i>
-        <a href="{{ csp.get_absolute_url }}">{{ csp }}</a>
-    </td>
-
-    {# Type #}
-    <td>
-        {% if csp.type %}{{ csp.get_type_display }}{% else %}&mdash;{% endif %}
-    </td>
-
-    {# Description #}
-    <td>
-        {{ csp.description|placeholder }}
-    </td>
-
-    {# Cable #}
-    {% if csp.cable %}
-        <td>
-            <a href="{{ csp.cable.get_absolute_url }}">{{ csp.cable }}</a>
-            <a href="{% url 'dcim:consoleserverport_trace' pk=csp.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                <i class="fa fa-share-alt" aria-hidden="true"></i>
-            </a>
-        </td>
-        {% include 'dcim/inc/cabletermination.html' with termination=csp.get_cable_peer %}
-    {% else %}
-        <td colspan="3">
-            <span class="text-muted">Not connected</span>
-        </td>
-    {% endif %}
-
-    {# Connection #}
-    {% include 'dcim/inc/endpoint_connection.html' with path=csp.path %}
-
-    {# Actions #}
-    <td class="text-right noprint">
-        {% if csp.cable %}
-            {% include 'dcim/inc/cable_toggle_buttons.html' with cable=csp.cable %}
-        {% elif perms.dcim.add_cable %}
-            <span class="dropdown">
-                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
-                </button>
-                <ul class="dropdown-menu dropdown-menu-right">
-                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=csp.pk termination_b_type='console-port' %}?return_url={{ device.get_absolute_url }}">Console Port</a></li>
-                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=csp.pk termination_b_type='front-port' %}?return_url={{ device.get_absolute_url }}">Front Port</a></li>
-                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=csp.pk termination_b_type='rear-port' %}?return_url={{ device.get_absolute_url }}">Rear Port</a></li>
-                </ul>
-            </span>
-        {% endif %}
-        {% if perms.dcim.change_consoleserverport %}
-            <a href="{% url 'dcim:consoleserverport_edit' pk=csp.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
-                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-            </a>
-        {% endif %}
-        {% if perms.dcim.delete_consoleserverport %}
-            {% if csp.connected_endpoint %}
-                <button class="btn btn-danger btn-xs" disabled="disabled">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </button>
-            {% else %}
-                <a href="{% url 'dcim:consoleserverport_delete' pk=csp.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-        {% endif %}
-    </td>
-</tr>