diff --git a/InvenTree/build/admin.py b/InvenTree/build/admin.py
index a5ad838660..a612ad8460 100644
--- a/InvenTree/build/admin.py
+++ b/InvenTree/build/admin.py
@@ -29,6 +29,14 @@ class BuildAdmin(ImportExportModelAdmin):
         'part__description',
     ]
 
+    autocomplete_fields = [
+        'parent',
+        'part',
+        'sales_order',
+        'take_from',
+        'destination',
+    ]
+
 
 class BuildItemAdmin(admin.ModelAdmin):
 
@@ -38,6 +46,13 @@ class BuildItemAdmin(admin.ModelAdmin):
         'quantity'
     )
 
+    autocomplete_fields = [
+        'build',
+        'bom_item',
+        'stock_item',
+        'install_into',
+    ]
+
 
 admin.site.register(Build, BuildAdmin)
 admin.site.register(BuildItem, BuildItemAdmin)
diff --git a/InvenTree/part/admin.py b/InvenTree/part/admin.py
index c429603176..fd0a16adc2 100644
--- a/InvenTree/part/admin.py
+++ b/InvenTree/part/admin.py
@@ -126,7 +126,7 @@ class PartRelatedAdmin(admin.ModelAdmin):
     """
     Class to manage PartRelated objects
     """
-        
+
     autocomplete_fields = ('part_1', 'part_2')
 
 
@@ -147,7 +147,7 @@ class PartStarAdmin(admin.ModelAdmin):
 class PartCategoryStarAdmin(admin.ModelAdmin):
 
     list_display = ('category', 'user')
-    
+
     autocomplete_fields = ('category',)