diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index df5afe564..d79e8b035 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1556,8 +1556,8 @@ class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
 
 class InterfaceListView(ObjectListView):
-    queryset = Interface.objects.select_related('device', 'name', 'description')\
-        .order_by('device', 'name', 'description')
+    queryset = Interface.objects.select_related('device', 'interface__device')\
+        .order_by('device__name', 'interface__name', 'interface__description')
     filter = filters.InterfaceFilter
     filter_form = forms.InterfaceFilterForm
     table = tables.InterfaceTable
diff --git a/netbox/templates/dcim/interface_list.html b/netbox/templates/dcim/interface_list.html
index f004a2e97..f3346980a 100644
--- a/netbox/templates/dcim/interface_list.html
+++ b/netbox/templates/dcim/interface_list.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="pull-right">
-    {% if perms.dcim.add_interfaces %}
+    {% if perms.dcim.add_interface %}
         <a href="{% url 'dcim:interface_import' %}" class="btn btn-info">
             <span class="fa fa-download" aria-hidden="true"></span>
             Import Interfaces