diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 76970dd57bc..5a9d6363e0e 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -1191,12 +1191,11 @@ private static RawInputModifiers GetInputModifiers(PointerFlags flags)
             var keyData = ToInt32(lParam);
             var key = KeyInterop.KeyFromVirtualKey(virtualKey, keyData);
             var physicalKey = KeyInterop.PhysicalKeyFromVirtualKey(virtualKey, keyData);
+            var keySymbol = KeyInterop.GetKeySymbol(virtualKey, keyData);
 
-            if (key == Key.None && physicalKey == PhysicalKey.None)
+            if (key == Key.None && physicalKey == PhysicalKey.None && string.IsNullOrWhiteSpace(keySymbol))
                 return null;
 
-            var keySymbol = KeyInterop.GetKeySymbol(virtualKey, keyData);
-
             return new RawKeyEventArgs(
                 WindowsKeyboardDevice.Instance,
                 timestamp,