diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 8826eb4439..f85cd5c155 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -151,6 +151,7 @@
+
diff --git a/src/Android/Effects/NoEmojiKeyboardEffect.cs b/src/Android/Effects/NoEmojiKeyboardEffect.cs
new file mode 100644
index 0000000000..618d9d4871
--- /dev/null
+++ b/src/Android/Effects/NoEmojiKeyboardEffect.cs
@@ -0,0 +1,24 @@
+using Android.Widget;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportEffect(typeof(NoEmojiKeyboardEffect), nameof(NoEmojiKeyboardEffect))]
+namespace Bit.Droid.Effects
+{
+ public class NoEmojiKeyboardEffect : PlatformEffect
+ {
+ protected override void OnAttached()
+ {
+ if (Control is EditText editText)
+ {
+ editText.InputType = Android.Text.InputTypes.ClassText | Android.Text.InputTypes.TextVariationVisiblePassword | Android.Text.InputTypes.TextFlagMultiLine;
+ }
+ }
+
+ protected override void OnDetached()
+ {
+ }
+ }
+}
+
diff --git a/src/App/Effects/NoEmojiKeyboardEffect.cs b/src/App/Effects/NoEmojiKeyboardEffect.cs
new file mode 100644
index 0000000000..285d2b032f
--- /dev/null
+++ b/src/App/Effects/NoEmojiKeyboardEffect.cs
@@ -0,0 +1,12 @@
+using System;
+using Xamarin.Forms;
+
+namespace Bit.App.Effects
+{
+ public class NoEmojiKeyboardEffect : RoutingEffect
+ {
+ public NoEmojiKeyboardEffect()
+ : base("Bitwarden.NoEmojiKeyboardEffect")
+ { }
+ }
+}
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index acaf7aacc8..0f02b8a839 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -6,6 +6,7 @@
xmlns:pages="clr-namespace:Bit.App.Pages"
xmlns:controls="clr-namespace:Bit.App.Controls"
xmlns:u="clr-namespace:Bit.App.Utilities"
+ xmlns:effects="clr-namespace:Bit.App.Effects"
x:DataType="pages:GeneratorPageViewModel"
Title="{Binding PageTitle}">
@@ -128,7 +129,11 @@
Text="{Binding WordSeparator}"
IsSpellCheckEnabled="False"
IsTextPredictionEnabled="False"
- StyleClass="box-value" />
+ StyleClass="box-value">
+
+
+
+
+