diff --git a/pcsx2-qt/Settings/ControllerBindingWidgets.cpp b/pcsx2-qt/Settings/ControllerBindingWidgets.cpp
index aeb054b6d2..0734473689 100644
--- a/pcsx2-qt/Settings/ControllerBindingWidgets.cpp
+++ b/pcsx2-qt/Settings/ControllerBindingWidgets.cpp
@@ -330,7 +330,7 @@ ControllerMacroEditWidget::ControllerMacroEditWidget(ControllerMacroWidget* pare
 	for (u32 i = 0; i < cinfo->num_bindings; i++)
 	{
 		const InputBindingInfo& bi = cinfo->bindings[i];
-		if (bi.type == InputBindingInfo::Type::Motor)
+		if (bi.bind_type == InputBindingInfo::Type::Motor)
 			continue;
 
 		QListWidgetItem* item = new QListWidgetItem();
@@ -413,7 +413,7 @@ void ControllerMacroEditWidget::updateBinds()
 	for (u32 i = 0, bind_index = 0; i < cinfo->num_bindings; i++)
 	{
 		const InputBindingInfo& bi = cinfo->bindings[i];
-		if (bi.type == InputBindingInfo::Type::Motor)
+		if (bi.bind_type == InputBindingInfo::Type::Motor)
 			continue;
 
 		const QListWidgetItem* item = m_ui.bindList->item(static_cast<int>(bind_index));
diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index b477f9459f..2ea58ae551 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -79,7 +79,8 @@ struct InputBindingInfo
 
 	const char* name;
 	const char* display_name;
-	Type type;
+	Type bind_type;
+	u16 bind_index;
 	GenericInputBinding generic_mapping;
 };
 
diff --git a/pcsx2/Frontend/FullscreenUI.cpp b/pcsx2/Frontend/FullscreenUI.cpp
index b5b54c7ad5..957f917760 100644
--- a/pcsx2/Frontend/FullscreenUI.cpp
+++ b/pcsx2/Frontend/FullscreenUI.cpp
@@ -3587,7 +3587,7 @@ void FullscreenUI::DrawControllerSettingsPage()
 		for (u32 i = 0; i < ci->num_bindings; i++)
 		{
 			const InputBindingInfo& bi = ci->bindings[i];
-			DrawInputBindingButton(bsi, bi.type, section, bi.name, bi.display_name, true);
+			DrawInputBindingButton(bsi, bi.bind_type, section, bi.name, bi.display_name, true);
 		}
 
 		MenuHeading((mtap_enabled[mtap_port] ?
@@ -3609,8 +3609,8 @@ void FullscreenUI::DrawControllerSettingsPage()
 				for (u32 i = 0; i < ci->num_bindings; i++)
 				{
 					const InputBindingInfo& bi = ci->bindings[i];
-					if (bi.type != InputBindingInfo::Type::Button && bi.type != InputBindingInfo::Type::Axis &&
-						bi.type != InputBindingInfo::Type::HalfAxis)
+					if (bi.bind_type != InputBindingInfo::Type::Button && bi.bind_type != InputBindingInfo::Type::Axis &&
+						bi.bind_type != InputBindingInfo::Type::HalfAxis)
 					{
 						continue;
 					}
diff --git a/pcsx2/Frontend/ImGuiOverlays.cpp b/pcsx2/Frontend/ImGuiOverlays.cpp
index bed960b5ca..3fa6359c48 100644
--- a/pcsx2/Frontend/ImGuiOverlays.cpp
+++ b/pcsx2/Frontend/ImGuiOverlays.cpp
@@ -506,7 +506,7 @@ void ImGuiManager::DrawInputsOverlay()
 		for (u32 bind = 0; bind < cinfo->num_bindings; bind++)
 		{
 			const InputBindingInfo& bi = cinfo->bindings[bind];
-			switch (bi.type)
+			switch (bi.bind_type)
 			{
 				case InputBindingInfo::Type::Axis:
 				case InputBindingInfo::Type::HalfAxis:
diff --git a/pcsx2/PAD/Host/PAD.cpp b/pcsx2/PAD/Host/PAD.cpp
index 9b9b37365a..28103de38f 100644
--- a/pcsx2/PAD/Host/PAD.cpp
+++ b/pcsx2/PAD/Host/PAD.cpp
@@ -364,34 +364,34 @@ void PAD::Update()
 }
 
 static const InputBindingInfo s_dualshock2_binds[] = {
-	{"Up", "D-Pad Up", InputBindingInfo::Type::Button, GenericInputBinding::DPadUp},
-	{"Right", "D-Pad Right", InputBindingInfo::Type::Button, GenericInputBinding::DPadRight},
-	{"Down", "D-Pad Down", InputBindingInfo::Type::Button, GenericInputBinding::DPadDown},
-	{"Left", "D-Pad Left", InputBindingInfo::Type::Button, GenericInputBinding::DPadLeft},
-	{"Triangle", "Triangle", InputBindingInfo::Type::Button, GenericInputBinding::Triangle},
-	{"Circle", "Circle", InputBindingInfo::Type::Button, GenericInputBinding::Circle},
-	{"Cross", "Cross", InputBindingInfo::Type::Button, GenericInputBinding::Cross},
-	{"Square", "Square", InputBindingInfo::Type::Button, GenericInputBinding::Square},
-	{"Select", "Select", InputBindingInfo::Type::Button, GenericInputBinding::Select},
-	{"Start", "Start", InputBindingInfo::Type::Button, GenericInputBinding::Start},
-	{"L1", "L1 (Left Bumper)", InputBindingInfo::Type::Button, GenericInputBinding::L1},
-	{"L2", "L2 (Left Trigger)", InputBindingInfo::Type::HalfAxis, GenericInputBinding::L2},
-	{"R1", "R1 (Right Bumper)", InputBindingInfo::Type::Button, GenericInputBinding::R1},
-	{"R2", "R2 (Right Trigger)", InputBindingInfo::Type::HalfAxis, GenericInputBinding::R2},
-	{"L3", "L3 (Left Stick Button)", InputBindingInfo::Type::Button, GenericInputBinding::L3},
-	{"R3", "R3 (Right Stick Button)", InputBindingInfo::Type::Button, GenericInputBinding::R3},
-	{"Analog", "Analog Toggle", InputBindingInfo::Type::Button, GenericInputBinding::System},
-	{"Pressure", "Apply Pressure", InputBindingInfo::Type::Button, GenericInputBinding::Unknown},
-	{"LUp", "Left Stick Up", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickUp},
-	{"LRight", "Left Stick Right", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickRight},
-	{"LDown", "Left Stick Down", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickDown},
-	{"LLeft", "Left Stick Left", InputBindingInfo::Type::HalfAxis, GenericInputBinding::LeftStickLeft},
-	{"RUp", "Right Stick Up", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickUp},
-	{"RRight", "Right Stick Right", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickRight},
-	{"RDown", "Right Stick Down", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickDown},
-	{"RLeft", "Right Stick Left", InputBindingInfo::Type::HalfAxis, GenericInputBinding::RightStickLeft},
-	{"LargeMotor", "Large (Low Frequency) Motor", InputBindingInfo::Type::Motor, GenericInputBinding::LargeMotor},
-	{"SmallMotor", "Small (High Frequency) Motor", InputBindingInfo::Type::Motor, GenericInputBinding::SmallMotor},
+	{"Up", "D-Pad Up", InputBindingInfo::Type::Button, PAD_UP, GenericInputBinding::DPadUp},
+	{"Right", "D-Pad Right", InputBindingInfo::Type::Button, PAD_RIGHT, GenericInputBinding::DPadRight},
+	{"Down", "D-Pad Down", InputBindingInfo::Type::Button, PAD_DOWN, GenericInputBinding::DPadDown},
+	{"Left", "D-Pad Left", InputBindingInfo::Type::Button, PAD_LEFT, GenericInputBinding::DPadLeft},
+	{"Triangle", "Triangle", InputBindingInfo::Type::Button, PAD_TRIANGLE, GenericInputBinding::Triangle},
+	{"Circle", "Circle", InputBindingInfo::Type::Button, PAD_CIRCLE, GenericInputBinding::Circle},
+	{"Cross", "Cross", InputBindingInfo::Type::Button, PAD_CROSS, GenericInputBinding::Cross},
+	{"Square", "Square", InputBindingInfo::Type::Button, PAD_SQUARE, GenericInputBinding::Square},
+	{"Select", "Select", InputBindingInfo::Type::Button, PAD_SELECT, GenericInputBinding::Select},
+	{"Start", "Start", InputBindingInfo::Type::Button, PAD_START, GenericInputBinding::Start},
+	{"L1", "L1 (Left Bumper)", InputBindingInfo::Type::Button, PAD_L1, GenericInputBinding::L1},
+	{"L2", "L2 (Left Trigger)", InputBindingInfo::Type::HalfAxis, PAD_L2, GenericInputBinding::L2},
+	{"R1", "R1 (Right Bumper)", InputBindingInfo::Type::Button, PAD_R1, GenericInputBinding::R1},
+	{"R2", "R2 (Right Trigger)", InputBindingInfo::Type::HalfAxis, PAD_R2, GenericInputBinding::R2},
+	{"L3", "L3 (Left Stick Button)", InputBindingInfo::Type::Button, PAD_L3, GenericInputBinding::L3},
+	{"R3", "R3 (Right Stick Button)", InputBindingInfo::Type::Button, PAD_R3, GenericInputBinding::R3},
+	{"Analog", "Analog Toggle", InputBindingInfo::Type::Button, PAD_ANALOG, GenericInputBinding::System},
+	{"Pressure", "Apply Pressure", InputBindingInfo::Type::Button, PAD_PRESSURE, GenericInputBinding::Unknown},
+	{"LUp", "Left Stick Up", InputBindingInfo::Type::HalfAxis, PAD_L_UP, GenericInputBinding::LeftStickUp},
+	{"LRight", "Left Stick Right", InputBindingInfo::Type::HalfAxis, PAD_L_RIGHT, GenericInputBinding::LeftStickRight},
+	{"LDown", "Left Stick Down", InputBindingInfo::Type::HalfAxis, PAD_L_DOWN, GenericInputBinding::LeftStickDown},
+	{"LLeft", "Left Stick Left", InputBindingInfo::Type::HalfAxis, PAD_L_LEFT, GenericInputBinding::LeftStickLeft},
+	{"RUp", "Right Stick Up", InputBindingInfo::Type::HalfAxis, PAD_R_UP, GenericInputBinding::RightStickUp},
+	{"RRight", "Right Stick Right", InputBindingInfo::Type::HalfAxis, PAD_R_RIGHT, GenericInputBinding::RightStickRight},
+	{"RDown", "Right Stick Down", InputBindingInfo::Type::HalfAxis, PAD_R_DOWN, GenericInputBinding::RightStickDown},
+	{"RLeft", "Right Stick Left", InputBindingInfo::Type::HalfAxis, PAD_R_LEFT, GenericInputBinding::RightStickLeft},
+	{"LargeMotor", "Large (Low Frequency) Motor", InputBindingInfo::Type::Motor, 0, GenericInputBinding::LargeMotor},
+	{"SmallMotor", "Small (High Frequency) Motor", InputBindingInfo::Type::Motor, 0, GenericInputBinding::SmallMotor},
 };
 
 static const char* s_dualshock2_invert_entries[] = {
@@ -484,7 +484,7 @@ std::vector<std::string> PAD::GetControllerBinds(const std::string_view& type)
 		for (u32 i = 0; i < info->num_bindings; i++)
 		{
 			const InputBindingInfo& bi = info->bindings[i];
-			if (bi.type == InputBindingInfo::Type::Unknown || bi.type == InputBindingInfo::Type::Motor)
+			if (bi.bind_type == InputBindingInfo::Type::Unknown || bi.bind_type == InputBindingInfo::Type::Motor)
 				continue;
 
 			ret.emplace_back(info->bindings[i].name);