diff --git a/pcsx2/USB/USB.cpp b/pcsx2/USB/USB.cpp
index 1182c74f10..cc32c2dae2 100644
--- a/pcsx2/USB/USB.cpp
+++ b/pcsx2/USB/USB.cpp
@@ -256,19 +256,16 @@ s32 USBopen(void* pDsp)
 
 #if _WIN32
 
-	HWND hWnd = (HWND)pDsp;
-	//HWND hWnd=(HWND)((uptr*)pDsp)[0];
-
-	if (!IsWindow(hWnd))
-		hWnd = *(HWND*)hWnd;
-
-	if (!IsWindow(hWnd))
-		hWnd = NULL;
-	else
+	HWND hWnd = 0;
+	if (IsWindow((HWND)pDsp))
 	{
-		while (GetWindowLong(hWnd, GWL_STYLE) & WS_CHILD)
-			hWnd = GetParent(hWnd);
+		hWnd = (HWND)pDsp;
 	}
+	else if (pDsp && !IsBadReadPtr(pDsp, 4) && IsWindow(*(HWND*)pDsp))
+	{
+		hWnd = *(HWND*)pDsp;
+	}
+
 	gsWnd = hWnd;
 	pDsp = gsWnd;
 #elif defined(__linux__)
diff --git a/pcsx2/USB/shared/rawinput_usb.cpp b/pcsx2/USB/shared/rawinput_usb.cpp
index 90793882c8..3299f73919 100644
--- a/pcsx2/USB/shared/rawinput_usb.cpp
+++ b/pcsx2/USB/shared/rawinput_usb.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <mutex>
 #include "../platcompat.h"
+#include "PAD/Windows/WndProcEater.h"
 
 extern HINSTANCE hInst;
 
@@ -30,10 +31,7 @@ namespace shared
 
 		static std::vector<ParseRawInputCB*> callbacks;
 
-		HWND msgWindow = nullptr;
-		WNDPROC eatenWndProc = nullptr;
-		HWND eatenWnd = nullptr;
-		HHOOK hHook = nullptr, hHookWnd = nullptr, hHookKB = nullptr;
+		bool inited = false;
 		bool skipInput = false;
 		std::mutex cb_mutex;
 
@@ -114,7 +112,6 @@ namespace shared
 
 		static int RegisterRaw(HWND hWnd)
 		{
-			msgWindow = hWnd;
 			RAWINPUTDEVICE Rid[4];
 			Rid[0].usUsagePage = 0x01;
 			Rid[0].usUsage = HID_USAGE_GENERIC_GAMEPAD;
@@ -145,37 +142,13 @@ namespace shared
 			return 1;
 		}
 
-		static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+		static ExtraWndProcResult RawInputProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* out)
 		{
-			switch (uMsg)
-			{
-				case WM_ACTIVATE:
-					Console.WriteLn("******      WM_ACTIVATE        ****** %p %d\n", hWnd, LOWORD(wParam) != WA_INACTIVE);
-					skipInput = LOWORD(wParam) == WA_INACTIVE;
-					break;
-				case WM_SETFOCUS:
-					Console.WriteLn("******      WM_SETFOCUS        ****** %p\n", hWnd);
-					skipInput = false;
-					break;
-				case WM_KILLFOCUS:
-					Console.WriteLn("******      WM_KILLFOCUS        ****** %p\n", hWnd);
-					skipInput = true;
-					break;
-			}
-			return 0;
-		}
-
-		static LRESULT CALLBACK RawInputProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-		{
-			PRAWINPUT pRawInput;
+			PRAWINPUT pRawInput = nullptr;
 			UINT bufferSize = 0;
 
 			switch (uMsg)
 			{
-				case WM_CREATE:
-					if (eatenWnd == nullptr)
-						RegisterRaw(hWnd);
-					break;
 				case WM_INPUT:
 				{
 					if (skipInput)
@@ -201,6 +174,9 @@ namespace shared
 					free(pRawInput);
 					break;
 				}
+				case WM_ENABLE:
+					skipInput = !wParam;
+					break;
 				case WM_ACTIVATE:
 					Console.WriteLn("******      WM_ACTIVATE        ****** %p %d\n", hWnd, LOWORD(wParam) != WA_INACTIVE);
 					skipInput = LOWORD(wParam) == WA_INACTIVE;
@@ -209,94 +185,49 @@ namespace shared
 					break;
 				case WM_SETFOCUS:
 					Console.WriteLn("******      WM_SETFOCUS        ****** %p\n", hWnd);
-					//skipInput = false; //TODO when the hell is WM_SETFOCUS sent? seems like only when mouse is capped
+					skipInput = false;
 					break;
 				case WM_KILLFOCUS:
 					Console.WriteLn("******      WM_KILLFOCUS        ****** %p\n", hWnd);
-					//skipInput = true;
+					skipInput = true;
 					break;
 				case WM_SIZE:
 					if (cursorCaptured)
 						WindowResized(hWnd);
 					break;
 				case WM_DESTROY:
-					if (eatenWnd == nullptr)
-						RegisterRaw(nullptr);
 					Uninitialize();
 					break;
 			}
 
-			if (eatenWndProc)
-				return CallWindowProc(eatenWndProc, hWnd, uMsg, wParam, lParam);
-			//else
-			//	return DefWindowProc(hWnd, uMsg, wParam, lParam);
-			return 0;
-		}
-
-		static LRESULT CALLBACK HookProc(INT code, WPARAM wParam, LPARAM lParam)
-		{
-			MSG* msg = reinterpret_cast<MSG*>(lParam);
-
-			//Console.Warning("hook: %d, %d, %d\n", code, wParam, lParam);
-			if (code == HC_ACTION)
-				RawInputProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-			return CallNextHookEx(hHook, code, wParam, lParam);
-		}
-
-		static LRESULT CALLBACK HookWndProc(INT code, WPARAM wParam, LPARAM lParam)
-		{
-			MSG* msg = reinterpret_cast<MSG*>(lParam);
-
-			//Console.Warning("hook: %d, %d, %d\n", code, wParam, lParam);
-			if (code == HC_ACTION)
-				MyWndProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-			return CallNextHookEx(hHookWnd, code, wParam, lParam);
-		}
-
-		static LRESULT CALLBACK KBHookProc(INT code, WPARAM wParam, LPARAM lParam)
-		{
-			Console.Warning("kb hook: %d, %zd, %zd\n", code, wParam, lParam);
-			KBDLLHOOKSTRUCT* kb = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
-			//if(code == HC_ACTION)
-			//	RawInputProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-			return CallNextHookEx(0, code, wParam, lParam);
+			return CONTINUE_BLISSFULLY;
 		}
 
 		int Initialize(void* ptr)
 		{
-			HWND hWnd = reinterpret_cast<HWND>(ptr);
+			skipInput = false;
+			// Reinitialized without USBclose, like when disc swapping
+			if (inited)
+				return 1;
+
+			HWND hWnd = static_cast<HWND>(ptr);
 			if (!InitHid())
 				return 0;
 
-#if 0
-	if (!RegisterRaw(hWnd))
-		return 0;
-	hHook = SetWindowsHookEx(WH_GETMESSAGE, HookProc, hInst, 0);
-	//hHookWnd = SetWindowsHookEx(WH_CALLWNDPROC, HookWndProc, hInst, 0);
-	//hHookKB = SetWindowsHookEx(WH_KEYBOARD_LL, KBHookProc, hInst, 0);
-	//int err = GetLastError();
-#else
-			eatenWnd = hWnd;
-			eatenWndProc = (WNDPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)RawInputProc);
 			RegisterRaw(hWnd);
-#endif
+			hWndGSProc.SetWndHandle(hWnd);
+			hWndGSProc.Eat(RawInputProc, 0);
+			inited = true;
 			return 1;
 		}
 
 		void Uninitialize()
 		{
-			if (hHook)
-			{
-				UnhookWindowsHookEx(hHook);
-				//UnhookWindowsHookEx(hHookKB);
-				hHook = 0;
-			}
-			if (eatenWnd)
-				RegisterRaw(nullptr);
-			if (eatenWnd && eatenWndProc)
-				SetWindowLongPtr(eatenWnd, GWLP_WNDPROC, (LONG_PTR)eatenWndProc);
-			eatenWndProc = nullptr;
-			eatenWnd = nullptr;
+			if (!inited)
+				return;
+			RegisterRaw(nullptr);
+			hWndGSProc.ReleaseExtraProc(RawInputProc);
+			inited = false;
 		}
 
 	} // namespace rawinput