diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 21c2f4244..5f61e03ba 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -10,11 +10,14 @@ from utilities.tables import (
     BaseTable, BooleanColumn, ButtonsColumn, ChoiceFieldColumn, ColorColumn, ColoredLabelColumn, LinkedCountColumn,
     TagColumn, ToggleColumn,
 )
-from .template_code import CABLETERMINATION, DEVICE_LINK, INTERFACE_IPADDRESSES, INTERFACE_TAGGED_VLANS
+from .template_code import (
+    CABLETERMINATION, CONSOLEPORT_BUTTONS, DEVICE_LINK, INTERFACE_IPADDRESSES, INTERFACE_TAGGED_VLANS,
+)
 
 __all__ = (
     'ConsolePortTable',
     'ConsoleServerPortTable',
+    'DeviceConsolePortTable',
     'DeviceImportTable',
     'DeviceTable',
     'DeviceBayTable',
@@ -237,6 +240,27 @@ class ConsolePortTable(DeviceComponentTable, PathEndpointTable):
         default_columns = ('pk', 'device', 'name', 'label', 'type', 'description')
 
 
+class DeviceConsolePortTable(ConsolePortTable):
+    name = tables.TemplateColumn(
+        template_code='<i class="fa fa-keyboard-o"></i> <a href="{{ record.get_absolute_url }}">{{ value }}</a>'
+    )
+    actions = ButtonsColumn(
+        model=ConsolePort,
+        buttons=('edit', 'delete'),
+        prepend_template=CONSOLEPORT_BUTTONS
+    )
+
+    class Meta(DeviceComponentTable.Meta):
+        model = ConsolePort
+        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 ConsoleServerPortTable(DeviceComponentTable, PathEndpointTable):
     tags = TagColumn(
         url_name='dcim:consoleserverport_list'
diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index 7278de113..e17a5a877 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -73,3 +73,24 @@ UTILIZATION_GRAPH = """
 {% load helpers %}
 {% utilization_graph value %}
 """
+
+#
+# Device component buttons
+#
+
+CONSOLEPORT_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:consoleport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={{ device.get_absolute_url }}">Console Server Port</a></li>
+            <li><a href="{% url 'dcim:consoleport_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:consoleport_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 06fb7619f..3cf011503 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1019,6 +1019,9 @@ class DeviceView(ObjectView):
         consoleports = ConsolePort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'cable', '_path__destination',
         )
+        consoleport_table = tables.DeviceConsolePortTable(consoleports, orderable=False)
+        if request.user.has_perm('dcim.change_consoleport') or request.user.has_perm('dcim.delete_consoleport'):
+            consoleport_table.columns.show('pk')
 
         # Console server ports
         consoleserverports = ConsoleServerPort.objects.restrict(request.user, 'view').filter(
@@ -1079,7 +1082,7 @@ class DeviceView(ObjectView):
 
         return render(request, 'dcim/device.html', {
             'device': device,
-            'consoleports': consoleports,
+            'consoleport_table': consoleport_table,
             'consoleserverports': consoleserverports,
             'powerports': powerports,
             'poweroutlets': poweroutlets,
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index c06f86bf0..1a74016b2 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -131,7 +131,7 @@
                     <a href="#rearports" role="tab" data-toggle="tab">Rear Ports {% badge rearports|length %}</a>
                 </li>
                 <li role="presentation">
-                    <a href="#consoleports" role="tab" data-toggle="tab">Console Ports {% badge consoleports|length %}</a>
+                    <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>
@@ -670,27 +670,9 @@
                             <div class="panel-heading">
                                 <strong>Console Ports</strong>
                             </div>
-                            <table class="table table-hover panel-body component-list">
-                                <thead>
-                                    <tr>
-                                        {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
-                                            <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>
-                                {% for cp in consoleports %}
-                                    {% include 'dcim/inc/consoleport.html' %}
-                                {% endfor %}
-                            </table>
+                            {% include 'responsive_table.html' with table=consoleport_table %}
                             <div class="panel-footer noprint">
-                                {% if consoleports and perms.dcim.change_consoleport %}
+                                {% if perms.dcim.change_consoleport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_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>
@@ -701,7 +683,7 @@
                                         <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if consoleports and perms.dcim.delete_consoleport %}
+                                {% if perms.dcim.delete_consoleport %}
                                     <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_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>
@@ -713,6 +695,7 @@
                                         </a>
                                     </div>
                                 {% endif %}
+                                <div class="clearfix"></div>
                             </div>
                         </div>
                     </form>
diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html
deleted file mode 100644
index ace09cfe2..000000000
--- a/netbox/templates/dcim/inc/consoleport.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<tr class="consoleport{% if cp.cable %} {{ cp.cable.get_status_class }}{% endif %}">
-
-    {# Checkbox #}
-    {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
-        <td class="pk">
-            <input name="pk" type="checkbox" value="{{ cp.pk }}" />
-        </td>
-    {% endif %}
-
-    {# Name #}
-    <td>
-        <i class="fa fa-fw fa-keyboard-o"></i>
-        <a href="{{ cp.get_absolute_url }}">{{ cp }}</a>
-    </td>
-
-    {# Type #}
-    <td>
-        {% if cp.type %}{{ cp.get_type_display }}{% else %}&mdash;{% endif %}
-    </td>
-
-    {# Description #}
-    <td>
-        {{ cp.description }}
-    </td>
-
-    {# Cable #}
-    {% if cp.cable %}
-        <td>
-            <a href="{{ cp.cable.get_absolute_url }}">{{ cp.cable }}</a>
-            <a href="{% url 'dcim:consoleport_trace' pk=cp.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=cp.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=cp.path %}
-
-    {# Actions #}
-    <td class="text-right noprint">
-        {% if cp.cable %}
-            {% include 'dcim/inc/cable_toggle_buttons.html' with cable=cp.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:consoleport_connect' termination_a_id=cp.pk termination_b_type='console-server-port' %}?return_url={{ device.get_absolute_url }}">Console Server Port</a></li>
-                    <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=cp.pk termination_b_type='front-port' %}?return_url={{ device.get_absolute_url }}">Front Port</a></li>
-                    <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=cp.pk termination_b_type='rear-port' %}?return_url={{ device.get_absolute_url }}">Rear Port</a></li>
-                </ul>
-            </span>
-        {% endif %}
-        {% if perms.dcim.change_consoleport %}
-            <a href="{% url 'dcim:consoleport_edit' pk=cp.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_consoleport %}
-            {% if cp.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:consoleport_delete' pk=cp.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>