diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/config.cpp
index acdfb5e4ef..75c2af1b9d 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/config.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/config.cpp
@@ -520,11 +520,13 @@ void GetControllerAll(HWND hDlg, int controller)
 
 void UpdateVisibleItems(HWND hDlg, int controllertype)
 {	
+	/*
 	if(controllertype == CTL_TYPE_KEYBOARD)	
 		ComboBox_Enable(GetDlgItem(hDlg, IDC_JOYNAME), FALSE);		
 	else
 		ComboBox_Enable(GetDlgItem(hDlg, IDC_JOYNAME), TRUE);
-	
+	*/
+
 	if(controllertype)
 	{
 		// 4 extra buttons
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index 1506c8df05..a024bd6257 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -90,9 +90,12 @@ void DllConfig(HWND _hParent)
 		return;
 	}
 
-	LoadConfig();
+	LoadConfig();	// load settings
 	if(OpenConfig(nJoy_hInst, _hParent))
+	{
 		SaveConfig();
+	}
+	LoadConfig();	// reload settings
 }
 
 // Init PAD (start emulation)