diff --git a/src/Wpf.Ui/Appearance/SystemThemeWatcher.cs b/src/Wpf.Ui/Appearance/SystemThemeWatcher.cs
index 841a6b4bd..3bc005284 100644
--- a/src/Wpf.Ui/Appearance/SystemThemeWatcher.cs
+++ b/src/Wpf.Ui/Appearance/SystemThemeWatcher.cs
@@ -151,7 +151,9 @@ public static void UnWatch(Window? window)
     /// </summary>
     private static IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
     {
-        if (msg == (int)PInvoke.WM_WININICHANGE)
+        if (msg == (int)PInvoke.WM_DWMCOLORIZATIONCOLORCHANGED ||
+            msg == (int)PInvoke.WM_THEMECHANGED ||
+            msg == (int)PInvoke.WM_SYSCOLORCHANGE)
         {
             UpdateObservedWindow(hWnd);
         }