diff --git a/src/Input.c b/src/Input.c
index b6a048e16..77e8677e1 100644
--- a/src/Input.c
+++ b/src/Input.c
@@ -200,10 +200,9 @@ void Input_SetPressed(int key, cc_bool pressed) {
 	Pointer_SetPressed(0, pressed);
 }
 
-void Key_Clear(void) {
+void Input_Clear(void) {
 	int i;
-	/* only resets keyboard keys, not mouse state */
-	for (i = 0; i < KEY_XBUTTON1; i++) {
+	for (i = 0; i < INPUT_COUNT; i++) {
 		if (Input_Pressed[i]) Input_SetPressed(i, false);
 	}
 }
@@ -1033,6 +1032,7 @@ static void HandleInputUp(void* obj, int key) {
 	if (key == KeyBinds[KEYBIND_PICK_BLOCK])   MouseStateRelease(MOUSE_MIDDLE);
 }
 
+static void HandleFocusChanged(void* obj) { if (!Window_Focused) Input_Clear(); }
 void InputHandler_Init(void) {
 	Event_RegisterMove(&PointerEvents.Moved, NULL, HandlePointerMove);
 	Event_RegisterInt(&PointerEvents.Down,   NULL, HandlePointerDown);
@@ -1041,6 +1041,7 @@ void InputHandler_Init(void) {
 	Event_RegisterInt(&InputEvents.Up,       NULL, HandleInputUp);
 	Event_RegisterFloat(&InputEvents.Wheel,  NULL, HandleMouseWheel);
 
+	Event_RegisterVoid(&WindowEvents.FocusChanged,         NULL, HandleFocusChanged);
 	Event_RegisterVoid(&UserEvents.HackPermissionsChanged, NULL, InputHandler_CheckZoomFov);
 	KeyBind_Init();
 	Hotkeys_Init();
diff --git a/src/Input.h b/src/Input.h
index 5ac74eade..fbbfe2de4 100644
--- a/src/Input.h
+++ b/src/Input.h
@@ -66,9 +66,9 @@ extern cc_bool Input_Pressed[INPUT_COUNT];
 /* Raises InputEvents.Up   if not pressed, but was pressed before. */
 /* Raises InputEvents.Down if pressed (repeating is whether it was pressed before) */
 void Input_SetPressed(int key, cc_bool pressed);
-/* Resets all keyboard keys to released state. */
-/* Raises InputEvents.Up for each previously pressed key. */
-void Key_Clear(void);
+/* Resets all keyboard buttons to released state. */
+/* Raises InputEvents.Up for each previously pressed button. */
+void Input_Clear(void);
 
 /* Whether raw mouse/touch input is being listened for. */
 extern cc_bool Input_RawMode;
diff --git a/src/Window.c b/src/Window.c
index e52c1b21b..88545e35a 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -231,11 +231,6 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
 		break;
 
 	case WM_MOUSEMOVE:
-		/* Set before position change, in case mouse buttons changed when outside window */
-		Input_SetPressed(KEY_LMOUSE, (wParam & 0x01) != 0);
-		Input_SetPressed(KEY_RMOUSE, (wParam & 0x02) != 0);
-		Input_SetPressed(KEY_MMOUSE, (wParam & 0x10) != 0);
-		/* TODO: do we need to set XBUTTON1/XBUTTON2 here */
 		Pointer_SetPosition(0, LOWORD(lParam), HIWORD(lParam));
 		break;
 
@@ -341,7 +336,7 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
 
 	case WM_KILLFOCUS:
 		/* TODO: Keep track of keyboard when focus is lost */
-		Key_Clear();
+		Input_Clear();
 		break;
 
 	case WM_CLOSE:
@@ -1163,7 +1158,7 @@ void Window_ProcessEvents(void) {
 			Window_Focused = e.type == FocusIn;
 			Event_RaiseVoid(&WindowEvents.FocusChanged);
 			/* TODO: Keep track of keyboard when focus is lost */
-			if (!Window_Focused) Key_Clear();
+			if (!Window_Focused) Input_Clear();
 			break;
 
 		case MappingNotify:
@@ -2909,7 +2904,7 @@ static EM_BOOL Window_TouchEnd(int type, const EmscriptenTouchEvent* ev, void* d
 
 static EM_BOOL Window_Focus(int type, const EmscriptenFocusEvent* ev, void* data) {
 	Window_Focused = type == EMSCRIPTEN_EVENT_FOCUS;
-	if (!Window_Focused) Key_Clear();
+	if (!Window_Focused) Input_Clear();
 
 	Event_RaiseVoid(&WindowEvents.FocusChanged);
 	return true;