diff --git a/src/popup/app/current/current.component.ts b/src/popup/app/current/current.component.ts
index b50e9ff3208..99a651b36ec 100644
--- a/src/popup/app/current/current.component.ts
+++ b/src/popup/app/current/current.component.ts
@@ -143,7 +143,7 @@ export class CurrentController {
 
     private sortUriMatch(cipher: any) {
         // exact matches should sort earlier.
-        return this.url && this.url.startsWith(cipher.uri) ? 0 : 1;
+        return cipher.login && cipher.login.uri && this.url && this.url.startsWith(cipher.login.uri) ? 0 : 1;
     }
 
     private sortLastUsed(cipher: any) {