diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index e217104dda..2aa9ea7d0a 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -159,7 +159,7 @@ namespace Avalonia.Win32
                 cbSize = Marshal.SizeOf(typeof(UnmanagedMethods.WNDCLASSEX)),
                 lpfnWndProc = _wndProcDelegate,
                 hInstance = UnmanagedMethods.GetModuleHandle(null),
-                lpszClassName = "AvaloniaMessageWindow",
+                lpszClassName = "AvaloniaMessageWindow " + Guid.NewGuid(),
             };
 
             ushort atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);