diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
index 44bd586247..1b60d418ac 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
@@ -365,12 +365,12 @@ void WiimotePadConfigDialog::UpdateDeviceList()
 		m_Joyname[i]->Clear();
 
 		// Search for devices and add them to the device list	
-		if (WiiMoteEmu::NumPads > 0)
+		if (WiiMoteEmu::joyinfo.size() > 0)
 		{
-			for (int j = 0; j < WiiMoteEmu::NumPads; j++)	
+			for (int j = 0; j < WiiMoteEmu::joyinfo.size(); j++)	
 				m_Joyname[i]->Append(wxString::FromAscii(WiiMoteEmu::joyinfo.at(j).Name.c_str()));
 			// Set selection
-			for (int j = 0; j <  WiiMoteEmu::NumPads; j++)	
+			for (int j = 0; j < WiiMoteEmu::joyinfo.size(); j++)	
 				if (WiiMoteEmu::joyinfo.at(j).Name == WiiMoteEmu::PadMapping[i].Name) m_Joyname[i]->SetSelection(j);
 			if (m_Joyname[i]->GetSelection() == -1) m_Joyname[i]->SetSelection(0);
 			// Load settings
diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
index 9d9eb956e0..487a6e0077 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
@@ -62,10 +62,8 @@ bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo
 	DEBUG_LOG(CONSOLE, "LocalSearchDevicesReset");
 	
 	// Turn off device polling while resetting
-	EnablePolling(false);
-	
-	bool bSuccess = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
-	
+	EnablePolling(false);	
+	bool bSuccess = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);	
 	EnablePolling(true);
 	
 	DoLocalSearchDevices(_joyinfo, _NumPads);
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 538181d0f7..ceda5cabc0 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -366,13 +366,13 @@ void PADConfigDialognJoy::UpdateDeviceList()
 		m_Joyname[i]->Clear();
 
 		// Search for devices and add them to the device list	
-		if (NumPads > 0)
+		if (joyinfo.size() > 0)
 		{			
-			for (int j = 0; j < NumPads; j++)	
+			for (int j = 0; j < joyinfo.size(); j++)	
 				m_Joyname[i]->Append(wxString::FromAscii(joyinfo.at(j).Name.c_str()));
 			// Set selection
 							//PanicAlert("%s", PadMapping[i].Name.c_str());
-			for (int j = 0; j < NumPads; j++)
+			for (int j = 0; j < joyinfo.size(); j++)
 			{	
 				if (joyinfo.at(j).Name == PadMapping[i].Name) m_Joyname[i]->SetSelection(j);
 			}
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index 2beb4471c6..461ae011d5 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -445,24 +445,21 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
 
 bool LocalSearchDevices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
 {
-	// Turn off device polling while searching
-	EnablePolling(false);
-
 	//DEBUG_LOG(PAD, "LocalSearchDevices");
 	bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads);
 	
 	DoLocalSearchDevices(_joyinfo, _NumPads);
 	
-	EnablePolling(true);
-	
 	return Success;
 }
 
 bool LocalSearchDevicesReset(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads)
 {
 	//DEBUG_LOG(PAD, "LocalSearchDevicesUpdate: %i", IsPolling());
-	
-	bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);
+	// Turn off device polling while resetting
+	EnablePolling(false);	
+	bool Success = InputCommon::SearchDevicesReset(_joyinfo, _NumPads);		
+	EnablePolling(true);
 	
 	DoLocalSearchDevices(_joyinfo, _NumPads);