From 434b24a62c05b7d9651876990e9514e9403fe581 Mon Sep 17 00:00:00 2001
From: malaguenha <tiesystems@yahoo.co.jp>
Date: Fri, 31 Mar 2023 08:10:48 +0900
Subject: [PATCH] Avoid IME to be disabled after popups

---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index e066bbe5f6..9dbb7b77d8 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -150,7 +150,12 @@ namespace Avalonia.Win32
 
             CreateWindow();
             _framebuffer = new FramebufferManager(_hwnd);
-            UpdateInputMethod(GetKeyboardLayout(0));
+            
+            if (this is not PopupImpl)
+            {
+                UpdateInputMethod(GetKeyboardLayout(0));
+            }
+            
             if (glPlatform != null)
             {
                 if (_isUsingComposition)