diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 4c5b941c0..a1bdaf943 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -663,6 +663,14 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         }
         break;
 
+    case WM_SETFOCUS:
+    case WM_KILLFOCUS:
+        {
+            /* Update the focus in case it's changing between windows in the same application */
+            WIN_UpdateFocus(data->window);
+        }
+        break;
+
     case WM_POINTERUPDATE:
         {
             data->last_pointer_update = lParam;