diff --git a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
index e726ea86f4..4b09fa74b8 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
@@ -348,7 +348,7 @@ void Config::Load(bool ChangePad)
 		iniFile.Get(joySectionName.c_str(), "Diagonal", &WiiMoteEmu::PadMapping[i].SDiagonal, "100%");
 		iniFile.Get(joySectionName.c_str(), "Circle2Square", &WiiMoteEmu::PadMapping[i].bCircle2Square, false);
 		iniFile.Get(joySectionName.c_str(), "Rumble", &WiiMoteEmu::PadMapping[i].Rumble, true);
-		iniFile.Get(joySectionName.c_str(), "RumbleStrength", &WiiMoteEmu::PadMapping[i].RumbleStrength, 9);
+		iniFile.Get(joySectionName.c_str(), "RumbleStrength", &WiiMoteEmu::PadMapping[i].RumbleStrength, 9); // x10
 		iniFile.Get(joySectionName.c_str(), "TriggerType", &WiiMoteEmu::PadMapping[i].triggertype, 0);
 	}
 	// Load the IR cursor settings if it's avaliable for the GameId, if not load the default settings
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
index 88d3a2a6ba..eb527b4983 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
@@ -132,6 +132,14 @@ void WiimotePadConfigDialog::UpdateGUIButtonMapping(int controller)
 	m_RumbleStrength[controller]->SetSelection(WiiMoteEmu::PadMapping[controller].RumbleStrength);
 	m_TriggerType[controller]->SetSelection(WiiMoteEmu::PadMapping[controller].triggertype);
 
+	m_TiltComboInput[controller]->SetSelection(g_Config.Tilt.Type);
+	m_TiltComboRangeRoll[controller]->SetSelection(g_Config.Tilt.Range.RollDegree / 5 - 1); // 5 to 180, step 5
+	m_TiltComboRangePitch[controller]->SetSelection(g_Config.Tilt.Range.PitchDegree / 5 - 1); // 5 to 180, step 5
+	m_TiltRollSwing[controller]->SetValue(g_Config.Tilt.Range.RollSwing);
+	m_TiltPitchSwing[controller]->SetValue(g_Config.Tilt.Range.PitchSwing);
+	m_TiltRollInvert[controller]->SetValue(g_Config.Tilt.RollInvert);
+	m_TiltPitchInvert[controller]->SetValue(g_Config.Tilt.PitchInvert);
+
 	for (int i = 0; i < AN_CONTROLS; i++)
 	{
 		tmp << WiiMoteEmu::PadMapping[controller].Axis.keyForControls[i];
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
index f07669e84f..0ebbd0c027 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
@@ -33,7 +33,7 @@ BEGIN_EVENT_TABLE(WiimotePadConfigDialog,wxDialog)
 
 	EVT_CLOSE(WiimotePadConfigDialog::OnClose)
 	EVT_BUTTON(ID_CLOSE, WiimotePadConfigDialog::CloseClick)
-	EVT_BUTTON(ID_APPLY, WiimotePadConfigDialog::CloseClick)
+//	EVT_BUTTON(ID_APPLY, WiimotePadConfigDialog::CloseClick)
 
 	EVT_TIMER(IDTM_BUTTON, WiimotePadConfigDialog::OnButtonTimer)
 	EVT_TIMER(IDTM_UPDATE_PAD, WiimotePadConfigDialog::UpdatePad)
@@ -898,12 +898,12 @@ void WiimotePadConfigDialog::CreatePadGUIControls()
 		m_Controller[i]->SetSizer(m_sMain[i]);
 	}
 
-	m_Apply = new wxButton(this, ID_APPLY, wxT("Apply"));
+//	m_Apply = new wxButton(this, ID_APPLY, wxT("Apply"));
 	m_Close = new wxButton(this, ID_CLOSE, wxT("Close"));
 
 	wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
 	sButtons->AddStretchSpacer();
-	sButtons->Add(m_Apply, 0, (wxALL), 0);
+//	sButtons->Add(m_Apply, 0, (wxALL), 0);
 	sButtons->Add(m_Close, 0, (wxLEFT), 5);	
 
 	m_MainSizer = new wxBoxSizer(wxVERTICAL);