2 files changed, 10 insertions, 5 deletions

diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
index 069cbdef..6e23f76a 100644
--- a/src/core/MenuScreensCustom.cpp
+++ b/src/core/MenuScreensCustom.cpp
@@ -333,11 +333,8 @@ wchar* DetectJoystickDraw(bool* disabled, bool userHovering) {
 			}
 		}
 		if (found != -1 && CPad::XInputJoy1 != found) {
-			if (CPad::XInputJoy1 != -1 && CPad::XInputJoy1 != found)
-				CPad::XInputJoy2 = CPad::XInputJoy1;
-			else
-				CPad::XInputJoy2 = -1;
-
+			// We should never leave pads -1, so we can process them when they're connected and kinda support hotplug.
+			CPad::XInputJoy2 = (CPad::XInputJoy1 == -1 ? (found + 1) % 4 : CPad::XInputJoy1);
 			CPad::XInputJoy1 = found;
 			cachedButtonNum = 0; // fake too, because xinput bypass CControllerConfig
 		}
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 7f7f1f83..6de079e8 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -336,6 +336,14 @@ void LoadINIControllerSettings()
 					CPad::XInputJoy2 = i;
 			}
 		}
+
+		// There is no plug event on XInput, so let's leave XInputJoy1/2 as 0/1 respectively, and hotplug will be possible.
+		if (CPad::XInputJoy1 == -1) {
+			CPad::XInputJoy1 = 0;
+			CPad::XInputJoy2 = 1;
+		} else if (CPad::XInputJoy2 == -1) {
+			CPad::XInputJoy2 = (CPad::XInputJoy1 + 1) % 4;
+		}
 	}
 #else
 	ReadIniIfExists("Controller", "JoystickName", gSelectedJoystickName, 128);