diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index b6491a5890..880b210a6c 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -13,7 +13,6 @@ namespace Avalonia.Android
     {
         private readonly TView _host;
         private readonly InputMethodManager _imm;
-        private IInputElement _inputElement;
 
         public AndroidInputMethod(TView host)
         {
@@ -33,8 +32,10 @@ namespace Avalonia.Android
             _imm.RestartInput(_host);
         }
 
-        public void SetActive(bool active)
+        public void SetClient(ITextInputMethodClient client)
         {
+            var active = client is { };
+            
             if (active)
             {
                 _host.RequestFocus();
@@ -49,20 +50,8 @@ namespace Avalonia.Android
         {
         }
 
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
-            if (_inputElement != null)
-            {
-                _inputElement.PointerReleased -= RestoreSoftKeyboard;
-            }
-
-            _inputElement = options.Source as InputElement;
-
-            if (_inputElement == null)
-            {
-                _imm.HideSoftInputFromWindow(_host.WindowToken, HideSoftInputFlags.None);
-            }
-
             _host.InitEditorInfo((outAttrs) =>
             {
                 outAttrs.InputType = options.ContentType switch
@@ -70,7 +59,7 @@ namespace Avalonia.Android
                     TextInputContentType.Email => global::Android.Text.InputTypes.TextVariationEmailAddress,
                     TextInputContentType.Number => global::Android.Text.InputTypes.ClassNumber,
                     TextInputContentType.Password => global::Android.Text.InputTypes.TextVariationPassword,
-                    TextInputContentType.Phone => global::Android.Text.InputTypes.ClassPhone,
+                    TextInputContentType.Digits => global::Android.Text.InputTypes.ClassPhone,
                     TextInputContentType.Url => global::Android.Text.InputTypes.TextVariationUri,
                     _ => global::Android.Text.InputTypes.ClassText
                 };
@@ -86,8 +75,6 @@ namespace Avalonia.Android
 
                 outAttrs.ImeOptions |= ImeFlags.NoFullscreen | ImeFlags.NoExtractUi;
             });
-
-            //_inputElement.PointerReleased += RestoreSoftKeyboard;
         }
 
         private void RestoreSoftKeyboard(object sender, PointerReleasedEventArgs e)