diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
index 67f48d5fc3..f2a885639d 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
@@ -952,6 +952,7 @@ void WiimotePadConfigDialog::GeneralSettingsChanged(wxCommandEvent& event)
 	{
 	case IDC_JOYNAME:
 		WiiMoteEmu::WiiMapping[m_Page].ID = m_Joyname[m_Page]->GetSelection();
+		WiiMoteEmu::WiiMapping[m_Page].joy = WiiMoteEmu::joyinfo.at(WiiMoteEmu::WiiMapping[m_Page].ID).joy;
 		break;
 	case IDC_DEAD_ZONE_LEFT:
 		WiiMoteEmu::WiiMapping[m_Page].DeadZoneL = m_ComboDeadZoneLeft[m_Page]->GetSelection();
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 262744aa38..d09953386f 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -260,9 +260,11 @@ void PADConfigDialognJoy::DoSave(bool ChangePad, int Slot)
 		for(int i = 0; i < 4; i++)
 			SaveButtonMapping(i, true);
 		
-		g_Config.Save(Slot);
 		// Now we can update the ID
 		PadMapping[notebookpage].ID = m_Joyname[notebookpage]->GetSelection();
+		PadState[notebookpage].joy = joyinfo.at(PadMapping[notebookpage].ID).joy;
+
+		g_Config.Save(Slot);
 	}
 	else
 	{