diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
index 2194c8bd..5330ab3e 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
@@ -191,11 +191,17 @@ ajax '/ajax/data/device/netmap' => require_login sub {
         SIZEVALUE => (param('dynamicsize') ?
           (($device->get_column('log') || 1) * 1000) : 3000),
         (param('colorgroups') ?
-          (COLORVALUE => ($first_hgrp ? setting('host_group_displaynames')->{$first_hgrp} : 'Other')) : ()),
+          (COLORVALUE => ($first_hgrp ? setting('host_group_displaynames')->{$first_hgrp}
+                                      : 'Other')) : ()),
         LABEL => (param('showips')
           ? (($name eq $device->ip) ? $name : ($name .' '. $device->ip)) : $name),
         ORIG_LABEL => $name,
         INFOSTRING => make_node_infostring($device),
+        LINK => uri_for('/device', {
+          tab => 'netmap',
+          q => $device->ip,
+          firstsearch => 'on',
+        })->path_query,
       };
 
       if ($mapshow ne 'neighbors' and exists $pos_for->{$device->ip}) {
diff --git a/share/views/ajax/admintask/orphaned.tt b/share/views/ajax/admintask/orphaned.tt
index d0a9bda2..4b225b43 100644
--- a/share/views/ajax/admintask/orphaned.tt
+++ b/share/views/ajax/admintask/orphaned.tt
@@ -75,7 +75,7 @@
         <tbody>
         [% FOREACH row IN network %]
           <tr>
-            <td><a href="[% uri_for('/device') %]?tab=netmap&q=[% row.ip | uri %]">
+            <td><a href="[% uri_for('/device') %]?tab=netmap&q=[% row.ip | uri %]&firstsearch=on">
             [% row.dns || row.name || row.ip | html_entity %]</a></td>
             <td>
               [% IF row.location %]