diff --git a/src/angular/pipes/search-ciphers.pipe.ts b/src/angular/pipes/search-ciphers.pipe.ts
index 848f8519e7d..ba9c4549285 100644
--- a/src/angular/pipes/search-ciphers.pipe.ts
+++ b/src/angular/pipes/search-ciphers.pipe.ts
@@ -7,14 +7,16 @@ import { CipherView } from '../../models/view/cipherView';
 
 import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
 
+import { DeviceType } from '../../enums';
+
 @Pipe({
     name: 'searchCiphers',
 })
 export class SearchCiphersPipe implements PipeTransform {
     private onlySearchName = false;
 
-    constructor(private platformUtilsService: PlatformUtilsService) {
-        this.onlySearchName = platformUtilsService.isEdge();
+    constructor(platformUtilsService: PlatformUtilsService) {
+        this.onlySearchName = platformUtilsService.getDevice() === DeviceType.EdgeExtension;
     }
 
     transform(ciphers: CipherView[], searchText: string): CipherView[] {
@@ -34,6 +36,9 @@ export class SearchCiphersPipe implements PipeTransform {
             if (this.onlySearchName) {
                 return false;
             }
+            if (c.id.substr(0, 8) === searchText) {
+                return true;
+            }
             if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(searchText) > -1) {
                 return true;
             }