diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py
index c10ef44c3..1ea56b3ef 100644
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -981,7 +981,9 @@ class DeviceFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilter
             Q(serial__icontains=value.strip()) |
             Q(inventoryitems__serial__icontains=value.strip()) |
             Q(asset_tag__icontains=value.strip()) |
-            Q(comments__icontains=value)
+            Q(comments__icontains=value) |
+            Q(primary_ip4__address__startswith=value) |
+            Q(primary_ip6__address__startswith=value)
         ).distinct()
 
     def _has_primary_ip(self, queryset, name, value):
diff --git a/netbox/dcim/search.py b/netbox/dcim/search.py
index bae4f030f..7cb2c6205 100644
--- a/netbox/dcim/search.py
+++ b/netbox/dcim/search.py
@@ -41,6 +41,8 @@ class DeviceIndex(SearchIndex):
         ('asset_tag', 50),
         ('serial', 60),
         ('name', 100),
+        ('primary_ip4', 110),
+        ('primary_ip6', 110),
         ('description', 500),
         ('comments', 5000),
     )