diff --git a/src/App/Controls/FormEditorCell.cs b/src/App/Controls/FormEditorCell.cs
index 7deb902a4..a7bcac89f 100644
--- a/src/App/Controls/FormEditorCell.cs
+++ b/src/App/Controls/FormEditorCell.cs
@@ -25,9 +25,16 @@ namespace Bit.App.Controls
 
             stackLayout.Children.Add(Editor);
 
+            Tapped += FormEditorCell_Tapped;
+
             View = stackLayout;
         }
 
         public ExtendedEditor Editor { get; private set; }
+
+        private void FormEditorCell_Tapped(object sender, EventArgs e)
+        {
+            Editor.Focus();
+        }
     }
 }
diff --git a/src/App/Controls/FormEntryCell.cs b/src/App/Controls/FormEntryCell.cs
index c656d3b16..e7c5c731a 100644
--- a/src/App/Controls/FormEntryCell.cs
+++ b/src/App/Controls/FormEntryCell.cs
@@ -85,6 +85,8 @@ namespace Bit.App.Controls
             formStackLayout.Children.Add(Entry);
             imageStackLayout.Children.Add(formStackLayout);
 
+            Tapped += FormEntryCell_Tapped;
+
             View = imageStackLayout;
         }
 
@@ -95,5 +97,10 @@ namespace Bit.App.Controls
         {
             Entry.Focus();
         }
+
+        private void FormEntryCell_Tapped(object sender, EventArgs e)
+        {
+            Entry.Focus();
+        }
     }
 }
diff --git a/src/App/Controls/FormPickerCell.cs b/src/App/Controls/FormPickerCell.cs
index cd0d60b45..38760a4e1 100644
--- a/src/App/Controls/FormPickerCell.cs
+++ b/src/App/Controls/FormPickerCell.cs
@@ -36,10 +36,17 @@ namespace Bit.App.Controls
             stackLayout.Children.Add(Label);
             stackLayout.Children.Add(Picker);
 
+            Tapped += FormPickerCell_Tapped;
+
             View = stackLayout;
         }
 
         public Label Label { get; private set; }
         public ExtendedPicker Picker { get; private set; }
+
+        private void FormPickerCell_Tapped(object sender, EventArgs e)
+        {
+            Picker.Focus();
+        }
     }
 }
diff --git a/src/App/Pages/Settings/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs
index 8686ca88e..74e1dc03d 100644
--- a/src/App/Pages/Settings/SettingsEditFolderPage.cs
+++ b/src/App/Pages/Settings/SettingsEditFolderPage.cs
@@ -37,7 +37,6 @@ namespace Bit.App.Pages
 
             var nameCell = new FormEntryCell(AppResources.Name);
             nameCell.Entry.Text = folder.Name.Decrypt();
-            nameCell.Tapped += NameCell_Tapped;
 
             var deleteCell = new ExtendedTextCell { Text = AppResources.Delete, TextColor = Color.Red };
             deleteCell.Tapped += DeleteCell_Tapped;
@@ -46,7 +45,6 @@ namespace Bit.App.Pages
             {
                 Intent = TableIntent.Settings,
                 EnableScrolling = false,
-                EnableSelection = true,
                 HasUnevenRows = true,
                 VerticalOptions = LayoutOptions.Start,
                 Root = new TableRoot
@@ -107,15 +105,6 @@ namespace Bit.App.Pages
             }
         }
 
-        private void NameCell_Tapped(object sender, EventArgs e)
-        {
-            var cell = sender as FormEntryCell;
-            if(cell != null)
-            {
-                cell.Entry.Focus();
-            }
-        }
-
         private async void DeleteCell_Tapped(object sender, EventArgs e)
         {
             // TODO: Validate the delete operation. ex. Cannot delete a folder that has sites in it?
diff --git a/src/App/Pages/Vault/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditSitePage.cs
index 2aec929ed..4f728e59e 100644
--- a/src/App/Pages/Vault/VaultEditSitePage.cs
+++ b/src/App/Pages/Vault/VaultEditSitePage.cs
@@ -83,7 +83,6 @@ namespace Bit.App.Pages
                 Intent = TableIntent.Settings,
                 EnableScrolling = true,
                 HasUnevenRows = true,
-                EnableSelection = false,
                 Root = new TableRoot
                 {
                     new TableSection("Site Information")