diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py
index a1ead5494..f711ddc01 100644
--- a/netbox/extras/filtersets.py
+++ b/netbox/extras/filtersets.py
@@ -458,6 +458,7 @@ class ImageAttachmentFilterSet(ChangeLoggedModelFilterSet):
             return queryset
         return queryset.filter(
             Q(name__icontains=value) |
+            Q(image__icontains=value) |
             Q(description__icontains=value)
         )
 
diff --git a/netbox/extras/search.py b/netbox/extras/search.py
index bc6381512..688618690 100644
--- a/netbox/extras/search.py
+++ b/netbox/extras/search.py
@@ -19,6 +19,7 @@ class ImageAttachmentIndex(SearchIndex):
     model = models.ImageAttachment
     fields = (
         ('name', 100),
+        ('filename', 110),
         ('description', 500),
     )
     display_attrs = ('description',)