diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index b48e872fc..f029bf2f9 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -634,9 +634,9 @@ $('button.toggle-ips').click(function() {
 $('button.toggle-description').click(function() {
     var selected = $(this).attr('selected');
     if (selected) {
-        $('#interfaces_table iface.description').hide();
+        $('span.iface-description').hide();
     } else {
-        $('#interfaces_table iface.description').show();
+        $('span.iface-description').show();
     }
     $(this).attr('selected', !selected);
     $(this).children('span').toggleClass('glyphicon-check glyphicon-unchecked');
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 1db79c813..35f6c98e9 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -15,7 +15,7 @@
         {% endif %}
         <td>
         {% if iface.description %}
-            <span title="iface.description">{{ iface.description }}</span>
+            <span class="label label-primary iface-description" title="{{ iface.description }}">{{ iface.description }}</span>
         {% endif %}
     </td>
     </td>