diff --git a/netbox/project-static/js/interface_toggles.js b/netbox/project-static/js/interface_toggles.js
index 87b59b081..df8ac064b 100644
--- a/netbox/project-static/js/interface_toggles.js
+++ b/netbox/project-static/js/interface_toggles.js
@@ -16,21 +16,20 @@ $('input.interface-filter').on('input', function() {
     var filter = new RegExp(this.value);
     var interface;
 
-    for (interface of $('#interfaces_table > tbody > tr')) {
+    for (interface of $('#interfaces_table > tbody > tr.interface')) {
         // Slice off 'interface_' at the start of the ID
         if (filter.test(interface.id.slice(10))) {
             // Match the toggle in case the filter now matches the interface
             $(interface).find('input:checkbox[name=pk]').prop('checked', $('input.toggle').prop('checked'));
             $(interface).show();
+            if ($('button.toggle-ips').attr('selected')) {
+                $(interface).next('tr.ipaddresses').show();
+            }
         } else {
             // Uncheck to prevent actions from including it when it doesn't match
             $(interface).find('input:checkbox[name=pk]').prop('checked', false);
             $(interface).hide();
+            $(interface).next('tr.ipaddresses').hide();
         }
     }
-
-    // Show the ip addresses table row for the visible (matched) interfaces, if checked
-    if ($('button.toggle-ips').attr('selected')) {
-        $('#interfaces_table > tbody > tr:visible').next('tr.ipaddresses').show();
-    }
 });