diff --git a/src/ralph/discovery/admin.py b/src/ralph/discovery/admin.py
index 5ba4448b7b..4d73a62591 100644
--- a/src/ralph/discovery/admin.py
+++ b/src/ralph/discovery/admin.py
@@ -442,9 +442,14 @@ def count(self):
 admin.site.register(m.ComponentModelGroup, ComponentModelGroupAdmin)
 
 
-class DiskShareMountInline(admin.TabularInline):
+class DiskShareMountInline(ForeignKeyAutocompleteTabularInline):
     model = m.DiskShareMount
     exclude = ('created', 'modified')
+    related_search_fields = {
+        'device': ['^name'],
+        'server': ['^name'],
+        'address': ['^address'],
+    }
     extra = 0