diff --git a/post_office/admin.py b/post_office/admin.py
index f2d478d4..9e564df1 100644
--- a/post_office/admin.py
+++ b/post_office/admin.py
@@ -322,6 +322,7 @@ class AttachmentAdmin(admin.ModelAdmin):
     list_display = ['name', 'file']
     filter_horizontal = ['emails']
     search_fields = ["name"]
+    autocomplete_fields = ["emails"]
 
 
 admin.site.register(Email, EmailAdmin)