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)