diff --git a/umap/admin.py b/umap/admin.py
index c1e3d159..17a94bc2 100644
--- a/umap/admin.py
+++ b/umap/admin.py
@@ -9,6 +9,7 @@ class TileLayerAdmin(admin.ModelAdmin):
 
 class MapAdmin(admin.OSMGeoAdmin):
     search_fields = ("name",)
+    autocomplete_fields = ("owner", "editors")
 
 
 admin.site.register(Map, MapAdmin)