From 615a7670bdf0e7ab9e717185ad36f3a741df5e95 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 27 Nov 2017 22:49:27 -0500
Subject: [PATCH] focus search after content results are set

---
 src/App/Pages/Vault/VaultListCiphersPage.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/App/Pages/Vault/VaultListCiphersPage.cs b/src/App/Pages/Vault/VaultListCiphersPage.cs
index dc19a5543..8244b9e7f 100644
--- a/src/App/Pages/Vault/VaultListCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultListCiphersPage.cs
@@ -270,12 +270,6 @@ namespace Bit.App.Pages
             Search.TextChanged += SearchBar_TextChanged;
             Search.SearchButtonPressed += SearchBar_SearchButtonPressed;
             _filterResultsCancellationTokenSource = FetchAndLoadVault();
-
-            if(string.IsNullOrWhiteSpace(_uri) && !_folder && string.IsNullOrWhiteSpace(_folderId) &&
-                string.IsNullOrWhiteSpace(_collectionId) && !_favorites)
-            {
-                Search.FocusWithDelay(forceDelay: true);
-            }
         }
 
         protected override void OnDisappearing()
@@ -353,6 +347,12 @@ namespace Bit.App.Pages
                 if(PresentationSections.Count > 0 || !string.IsNullOrWhiteSpace(Search.Text))
                 {
                     Content = ResultsStackLayout;
+
+                    if(string.IsNullOrWhiteSpace(_uri) && !_folder && string.IsNullOrWhiteSpace(_folderId) &&
+                        string.IsNullOrWhiteSpace(_collectionId) && !_favorites)
+                    {
+                        Search.Focus();
+                    }
                 }
                 else if(_syncService.SyncInProgress)
                 {