diff --git a/src/App/Pages/Vault/AddEditPage.xaml.cs b/src/App/Pages/Vault/AddEditPage.xaml.cs
index d2df07d7d..88f502ef3 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -112,12 +112,12 @@ namespace Bit.App.Pages
             base.OnAppearing();
             await LoadOnAppearedAsync(_scrollView, true, async () =>
             {
-                var success = await _vm.LoadAsync();
+                var success = await _vm.LoadAsync(_appOptions);
                 if(!success)
                 {
                     await Navigation.PopModalAsync();
                 }
-                else if(!_vm.EditMode)
+                else if(!_vm.EditMode && string.IsNullOrWhiteSpace(_vm.Cipher.Name))
                 {
                     RequestFocus(_nameEntry);
                 }