diff --git a/datahub/export_win/admin.py b/datahub/export_win/admin.py
index 4a9b14fc6..5cd0c23a3 100644
--- a/datahub/export_win/admin.py
+++ b/datahub/export_win/admin.py
@@ -52,6 +52,10 @@ def __init__(self, *args, **kwargs):
 class AdvisorInline(BaseTabularInline):
     """Advisor model."""
 
+    autocomplete_fields = (
+        'adviser',
+    )
+
     model = WinAdviser
     form = AdvisorInlineForm
     fields = ('id', 'adviser', 'team_type', 'hq_team', 'location')
@@ -135,6 +139,12 @@ class WinAdmin(BaseModelAdminMixin, VersionAdmin):
     list_filter = (
         ('created_on', DateFieldListFilter),
     )
+    autocomplete_fields = (
+        'adviser',
+        'company',
+        'company_contacts',
+        'lead_officer',
+    )
     readonly_fields = (
         'id',
         'created_on',