diff --git a/src/video/win32/SDL_win32events.c b/src/video/win32/SDL_win32events.c
index 6605deff1..48d26f054 100644
--- a/src/video/win32/SDL_win32events.c
+++ b/src/video/win32/SDL_win32events.c
@@ -221,6 +221,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             const RAWMOUSE *raw_mouse = NULL;
             POINT point;
             USHORT flags;
+            int w, h;
 
             /* we're collecting data from the mouse */
             GetRawInputData((HRAWINPUT) lParam, RID_INPUT, NULL, &size,
@@ -241,6 +242,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             }
 /* FIXME: Doesn't this defeat the point of using raw input? */
             GetCursorPos(&point);
+            ScreenToClient(hwnd, &point);
+
+            SDL_GetWindowSize(data->windowID, &w, &h);
+            if (point.x >= 0 && point.y >= 0 && point.x < w && point.y < h) {
+                SDL_SetMouseFocus(index, data->windowID);
+            } else {
+                SDL_SetMouseFocus(index, 0);
+                /* FIXME: Should we be doing anything else here? */
+                break;
+            }
 
             /* if the message was sent by a tablet we have to send also pressure */
             if (index == tablet) {
@@ -286,14 +297,14 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
     case WM_MOUSELEAVE:
         {
-            int index;
-            SDL_Mouse *mouse;
+            int i;
 
-            index = data->videodata->mouse;
-            mouse = SDL_GetMouse(index);
+            for (i = 0; i < SDL_GetNumMice(); ++i) {
+                SDL_Mouse *mouse = SDL_GetMouse(i);
 
-            if (mouse->focus == data->windowID) {
-                SDL_SetMouseFocus(index, 0);
+                if (mouse->focus == data->windowID) {
+                    SDL_SetMouseFocus(i, 0);
+                }
             }
         }
         return (0);
diff --git a/src/video/win32/SDL_win32mouse.c b/src/video/win32/SDL_win32mouse.c
index 6d6cb6d90..96c4222bd 100644
--- a/src/video/win32/SDL_win32mouse.c
+++ b/src/video/win32/SDL_win32mouse.c
@@ -175,11 +175,9 @@ WIN_InitMouse(_THIS)
             int cursors;
             data->WTInfoA(WTI_DEVICES, DVC_NPRESSURE, &pressure);
             data->WTInfoA(WTI_DEVICES, DVC_NCSRTYPES, &cursors);
-            data->mouse =
-                SDL_AddMouse(&mouse, device_name, pressure.axMax,
-                             pressure.axMin, cursors);
+            SDL_AddMouse(&mouse, device_name, pressure.axMax, pressure.axMin, cursors);
         } else {
-            data->mouse = SDL_AddMouse(&mouse, device_name, 0, 0, 1);
+            SDL_AddMouse(&mouse, device_name, 0, 0, 1);
         }
         ++index;
         SDL_free(buffer);
diff --git a/src/video/win32/SDL_win32video.h b/src/video/win32/SDL_win32video.h
index 15c870053..eb6f56241 100644
--- a/src/video/win32/SDL_win32video.h
+++ b/src/video/win32/SDL_win32video.h
@@ -75,7 +75,6 @@ typedef struct SDL_VideoData
     BOOL (*WTClose) (HCTX);
 /* *INDENT-ON* */
 
-    int mouse;
     int keyboard;
     SDL_scancode *key_layout;
 } SDL_VideoData;