diff --git a/src/iOS.Autofill/CredentialProviderViewController.cs b/src/iOS.Autofill/CredentialProviderViewController.cs
index aed24579b..1181d5ae3 100644
--- a/src/iOS.Autofill/CredentialProviderViewController.cs
+++ b/src/iOS.Autofill/CredentialProviderViewController.cs
@@ -85,7 +85,14 @@ namespace Bit.iOS.Autofill
                     PerformSegue("lockPasswordSegue", this);
                     break;
                 default:
-                    PerformSegue("loginListSegue", this);
+                    if(_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
+                    {
+                        PerformSegue("loginSearchSegue", this);
+                    }
+                    else
+                    {
+                        PerformSegue("loginListSegue", this);
+                    }
                     break;
             }
         }
@@ -177,6 +184,7 @@ namespace Bit.iOS.Autofill
             if(navController != null)
             {
                 var listLoginController = navController.TopViewController as LoginListViewController;
+                var listSearchController = navController.TopViewController as LoginSearchViewController;
                 var fingerprintViewController = navController.TopViewController as LockFingerprintViewController;
                 var pinViewController = navController.TopViewController as LockPinViewController;
                 var passwordViewController = navController.TopViewController as LockPasswordViewController;
@@ -187,6 +195,11 @@ namespace Bit.iOS.Autofill
                     listLoginController.Context = _context;
                     listLoginController.CPViewController = this;
                 }
+                else if(listSearchController != null)
+                {
+                    listSearchController.Context = _context;
+                    listSearchController.CPViewController = this;
+                }
                 else if(fingerprintViewController != null)
                 {
                     fingerprintViewController.CPViewController = this;
@@ -219,8 +232,15 @@ namespace Bit.iOS.Autofill
                 {
                     PerformSegue("setupSegue", this);
                     return;
+                }
+                if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
+                {
+                    PerformSegue("loginSearchSegue", this);
+                }
+                else
+                {
+                    PerformSegue("loginListSegue", this);
                 }
-                PerformSegue("loginListSegue", this);
             });
         }
 
diff --git a/src/iOS.Autofill/LoginSearchViewController.cs b/src/iOS.Autofill/LoginSearchViewController.cs
index 59ec6506d..64f3c301f 100644
--- a/src/iOS.Autofill/LoginSearchViewController.cs
+++ b/src/iOS.Autofill/LoginSearchViewController.cs
@@ -29,6 +29,7 @@ namespace Bit.iOS.Autofill
             base.ViewDidLoad();
             NavItem.Title = AppResources.SearchVault;
             CancelBarButton.Title = AppResources.Cancel;
+            SearchBar.Placeholder = AppResources.Search;
 
             TableView.RowHeight = UITableView.AutomaticDimension;
             TableView.EstimatedRowHeight = 44;