diff --git a/src/popup/scss/environment.scss b/src/popup/scss/environment.scss
index dceaf50f7d..bc2e19304f 100644
--- a/src/popup/scss/environment.scss
+++ b/src/popup/scss/environment.scss
@@ -3,7 +3,7 @@
 html.browser_safari {
     header { 
         .search .fa {
-            left: 25px;
+            left: 20px;
         }
 
         .left + .search .fa {
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index b8a3dab6bb..f9f92cf242 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -6,8 +6,9 @@
         </button>
     </div>
     <div class="search">
-        <input type="search" placeholder="{{searchPlaceholder || ('searchVault' | i18n)}}" id="search"
-            [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
+        <input type="{{searchTypeSearch ? 'search' : 'text'}}"
+            placeholder="{{searchPlaceholder || ('searchVault' | i18n)}}" id="search" [(ngModel)]="searchText"
+            (input)="search(200)" appAutofocus>
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
diff --git a/src/popup/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts
index ccf9376616..a5d9b04ef8 100644
--- a/src/popup/vault/ciphers.component.ts
+++ b/src/popup/vault/ciphers.component.ts
@@ -51,6 +51,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     pagedCiphers: CipherView[] = [];
     nestedFolders: Array<TreeNode<FolderView>>;
     nestedCollections: Array<TreeNode<CollectionView>>;
+    searchTypeSearch = false;
 
     private didScroll = false;
     private selectedTimeout: number;
@@ -72,6 +73,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     }
 
     async ngOnInit() {
+        this.searchTypeSearch = !this.platformUtilsService.isSafari();
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             if (params.type) {
                 this.searchPlaceholder = this.i18nService.t('searchType');
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index dff39e0e72..f5e5e5b103 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -6,8 +6,8 @@
         </button>
     </div>
     <div class="search">
-        <input type="search" placeholder="{{'searchVault' | i18n}}" id="search" [(ngModel)]="searchText"
-            (input)="searchVault()">
+        <input type="{{searchTypeSearch ? 'search' : 'text'}}" placeholder="{{'searchVault' | i18n}}" id="search"
+            [(ngModel)]="searchText" (input)="searchVault()">
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
diff --git a/src/popup/vault/current-tab.component.ts b/src/popup/vault/current-tab.component.ts
index 070f3c1856..1d7f19817e 100644
--- a/src/popup/vault/current-tab.component.ts
+++ b/src/popup/vault/current-tab.component.ts
@@ -49,6 +49,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     searchText: string;
     inSidebar = false;
     showLeftHeader = false;
+    searchTypeSearch = false;
     loaded = false;
 
     private totpCode: string;
@@ -65,7 +66,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
         private searchService: SearchService, private storageService: StorageService) { }
 
     async ngOnInit() {
-        this.showLeftHeader = !this.platformUtilsService.isSafari();
+        this.showLeftHeader = this.searchTypeSearch = !this.platformUtilsService.isSafari();
         this.inSidebar = this.popupUtilsService.inSidebar(window);
 
         this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index ca2c269f7e..5058a58072 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -3,8 +3,8 @@
         <app-pop-out></app-pop-out>
     </div>
     <div class="search">
-        <input type="search" placeholder="{{'searchVault' | i18n}}" id="search" [(ngModel)]="searchText"
-            (input)="search(200)" appAutofocus>
+        <input type="{{searchTypeSearch ? 'search' : 'text'}}" placeholder="{{'searchVault' | i18n}}" id="search"
+            [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index f278a7ed3c..7d76f2ac3e 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -56,6 +56,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     scopeState: any;
     showLeftHeader = true;
     searchPending = false;
+    searchTypeSearch = false;
 
     private loadedTimeout: number;
     private selectedTimeout: number;
@@ -89,6 +90,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     }
 
     async ngOnInit() {
+        this.searchTypeSearch = !this.platformUtilsService.isSafari();
         this.showLeftHeader = !this.platformUtilsService.isSafari() &&
             !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
         this.stateService.remove('CiphersComponent');