diff --git a/desmume/src/addons/slot2_auto.cpp b/desmume/src/addons/slot2_auto.cpp
index b9f35138a..da098dcce 100644
--- a/desmume/src/addons/slot2_auto.cpp
+++ b/desmume/src/addons/slot2_auto.cpp
@@ -19,6 +19,9 @@
 #include "../registers.h"
 #include "../MMU.h"
 #include "../NDSSystem.h"
+#ifdef HOST_WINDOWS
+#include "../windows/inputdx.h"
+#endif
 
 class Slot2_Auto : public ISlot2Interface
 {
@@ -76,6 +79,12 @@ public:
 		mSelectedImplementation = slot2_List[selection];
 		mSelectedImplementation->connect();
 		printf("Slot2 auto-selected device type: %s\n", mSelectedImplementation->info()->name());
+
+#ifdef HOST_WINDOWS
+		Guitar.Enabled	= (selection == NDS_SLOT2_GUITARGRIP)?true:false;
+		Piano.Enabled	= (selection == NDS_SLOT2_EASYPIANO)?true:false;
+		Paddle.Enabled	= (selection == NDS_SLOT2_PADDLE)?true:false;
+#endif
 	}
 
 	virtual void disconnect()