diff --git a/src/Android/Renderers/CustomEditorRenderer.cs b/src/Android/Renderers/CustomEditorRenderer.cs
index 08fe73a0f..ed5ba203e 100644
--- a/src/Android/Renderers/CustomEditorRenderer.cs
+++ b/src/Android/Renderers/CustomEditorRenderer.cs
@@ -4,7 +4,7 @@ using Bit.Droid.Renderers;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
-[assembly: ExportRenderer(typeof(Entry), typeof(CustomEditorRenderer))]
+[assembly: ExportRenderer(typeof(Editor), typeof(CustomEditorRenderer))]
 namespace Bit.Droid.Renderers
 {
     public class CustomEditorRenderer : EditorRenderer
diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs
index cb102e30c..05d0a3657 100644
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -16,6 +16,7 @@ using Android.Support.V4.Content;
 using Android.Text;
 using Android.Text.Method;
 using Android.Views.Autofill;
+using Android.Views.InputMethods;
 using Android.Webkit;
 using Android.Widget;
 using Bit.App.Abstractions;
@@ -255,6 +256,8 @@ namespace Bit.Droid.Services
 #pragma warning restore CS0618 // Type or member is obsolete
             }
 
+            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning |
+                (ImeAction)ImeFlags.NoExtractUi;
             input.Text = text;
             input.SetSelection(text.Length);
             var container = new FrameLayout(activity);