diff --git a/Netdisco/lib/Netdisco/Web/Search.pm b/Netdisco/lib/Netdisco/Web/Search.pm
index 258fce26..1063622e 100644
--- a/Netdisco/lib/Netdisco/Web/Search.pm
+++ b/Netdisco/lib/Netdisco/Web/Search.pm
@@ -197,8 +197,8 @@ get '/search' => sub {
         else {
             my $s = schema('netdisco');
             if ($q =~ m{^[a-f0-9.:/]+$}i) {
-                if (NetAddr::IP::Lite->new($q) and
-                    $s->resultset('Device')->find($q)) {
+                my $ip = NetAddr::IP::Lite->new($q);
+                if ($ip and $s->resultset('Device')->search_by_field({ip => $q})->count) {
                     params->{'tab'} = 'device';
                 }
                 else {