diff --git a/Netdisco/Changes b/Netdisco/Changes
index 05b3c0a0..09a064cc 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -12,6 +12,7 @@
[BUG FIXES]
* [#85] device property in _no/_only fails with error (R. Kerr)
+ * Also prefer port filter when linking to connected devices
2.021001
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 64e41860..a3269099 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -240,7 +240,7 @@
[% END %]
+ self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port">
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]
[% IF params.neigh_id and (row.remote_id or row.remote_type) %]