diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 0f697a276..7d37de4a6 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1571,6 +1571,17 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
     device = forms.CharField(required=False, label='Device name')
 
 
+class InterfaceListFilterForm(BootstrapMixin, forms.Form):
+    site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
+    device = forms.ModelChoiceField(required=False, queryset=Device.objects.all(), to_field_name='slug')
+    enabled = form.ModelChoiceField(choices=((INTERFACE_ENABLED,'Enabled'),(INTERFACE_DISABLED,'Disabled')),required=False)
+    role = FilterChoiceField(
+        queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
+        to_field_name='slug',
+    )
+    mac_address = forms.CharField(required=False, label='MAC address')
+
+
 #
 # Interface connections
 #
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 571eb7d6c..971c69e40 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -104,7 +104,7 @@ DEVICE_STATUS = """
 """
 
 INTERFACE_ENABLED = """
-<span class="label label-{{ record.get_status_class }}">{{ record.is_enabled }}</span>
+<span class="label label-{{ record.get_status_class }}">{{ record.enabled }}</span>
 """
 
 DEVICE_PRIMARY_IP = """
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d31509acb..045154138 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1558,7 +1558,7 @@ class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
 class InterfaceListView(ObjectListView):
     queryset = Interface.objects.all()
     filter = filters.InterfaceFilter
-    filter_form = forms.InterfaceFilterForm
+    filter_form = forms.InterfaceListFilterForm
     table = tables.InterfaceListTable
     template_name = 'dcim/interface_list.html'
 
diff --git a/netbox/templates/dcim/interface_list.html b/netbox/templates/dcim/interface_list.html
index f3346980a..70f071df4 100644
--- a/netbox/templates/dcim/interface_list.html
+++ b/netbox/templates/dcim/interface_list.html
@@ -10,7 +10,6 @@
             Import Interfaces
         </a>
     {% endif %}
-    {% include 'inc/export_button.html' with obj_type='interfaces' %}
 </div>
 <h1>Interfaces</h1>
 <div class="row">