diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
index 2165ee938..1ef77e332 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -189,7 +189,7 @@ namespace Bit.App.Pages
         {
             var options = _lockOptions.Select(o => o.Key == _lockOptionValue ? $"✓ {o.Key}" : o.Key).ToArray();
             var selection = await Page.DisplayActionSheet(AppResources.LockOptions, AppResources.Cancel, null, options);
-            if(selection == AppResources.Cancel)
+            if(selection == null || selection == AppResources.Cancel)
             {
                 return;
             }
diff --git a/src/App/Pages/Vault/CiphersPageViewModel.cs b/src/App/Pages/Vault/CiphersPageViewModel.cs
index 7603dda4a..ab7fcb82f 100644
--- a/src/App/Pages/Vault/CiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/CiphersPageViewModel.cs
@@ -173,16 +173,10 @@ namespace Bit.App.Pages
 
         private async void CipherOptionsAsync(CipherView cipher)
         {
-            if(!(Page as BaseContentPage).DoOnce())
+            if((Page as BaseContentPage).DoOnce())
             {
-                return;
+                await Utilities.AppHelpers.CipherListOptions(Page, cipher);
             }
-            var option = await Page.DisplayActionSheet(cipher.Name, AppResources.Cancel, null, "1", "2");
-            if(option == AppResources.Cancel)
-            {
-                return;
-            }
-            // TODO: process options
         }
     }
 }