diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
index 640befba62..864c579319 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -198,7 +198,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateActive();
         }
         
-        void ITextInputMethodImpl.SetActive(ITextInputMethodClient client)
+        void ITextInputMethodImpl.SetClient(ITextInputMethodClient client)
         {
             _controlActive = client is { };
             UpdateActive();
@@ -272,7 +272,7 @@ namespace Avalonia.FreeDesktop.DBusIme
             UpdateCursorRect();
         }
 
-        public abstract void SetOptions(TextInputOptionsQueryEventArgs options);
+        public abstract void SetOptions(TextInputOptions options);
 
         void ITextInputMethodImpl.Reset()
         {
diff --git a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
index 31a061571f..15dc131e4e 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
@@ -93,7 +93,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
                 (uint)args.Timestamp).ConfigureAwait(false);
         }
         
-        public override void SetOptions(TextInputOptionsQueryEventArgs options) =>
+        public override void SetOptions(TextInputOptions options) =>
             Enqueue(async () =>
             {
                 if(_context == null)
diff --git a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs b/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
index 729b517f88..4404c903b7 100644
--- a/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
+++ b/src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
@@ -2,7 +2,7 @@ namespace Avalonia.Input.TextInput
 {
     public interface ITextInputMethodImpl
     {
-        void SetActive(ITextInputMethodClient? client);
+        void SetClient(ITextInputMethodClient? client);
         void SetCursorRect(Rect rect);
         void SetOptions(TextInputOptions options);
         void Reset();
diff --git a/src/Avalonia.Input/TextInput/InputMethodManager.cs b/src/Avalonia.Input/TextInput/InputMethodManager.cs
index 9f686a150a..e19bf91f95 100644
--- a/src/Avalonia.Input/TextInput/InputMethodManager.cs
+++ b/src/Avalonia.Input/TextInput/InputMethodManager.cs
@@ -46,11 +46,11 @@ namespace Avalonia.Input.TextInput
                     _transformTracker.SetVisual(_client?.TextViewVisual);
                     UpdateCursorRect();
                     
-                    _im?.SetActive(_client);
+                    _im?.SetClient(_client);
                 }
                 else
                 {
-                    _im?.SetActive(null);
+                    _im?.SetClient(null);
                     _transformTracker.SetVisual(null);
                 }
             }
@@ -92,6 +92,11 @@ namespace Avalonia.Input.TextInput
             _focusedElement = element;
 
             var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
+
+            if (_im != inputMethod)
+            {
+                _im?.SetClient(null);
+            }
             
             _im = inputMethod;
 
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
index 3649a884a6..cdc41bebf5 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
@@ -386,7 +386,7 @@ namespace Avalonia.Web.Blazor
         {
         }
 
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
         }
 
diff --git a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
index 71e33554f1..ad6c112043 100644
--- a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
+++ b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
@@ -216,7 +216,7 @@ namespace Avalonia.Win32.Input
             ImmSetCompositionFont(himc, ref logFont);
         }
         
-        public void SetOptions(TextInputOptionsQueryEventArgs options)
+        public void SetOptions(TextInputOptions options)
         {
             // we're skipping this. not usable on windows
         }