diff --git a/src/usb-pad/raw/raw-config.cpp b/src/usb-pad/raw/raw-config.cpp
index ac3e0282..70c4ca78 100644
--- a/src/usb-pad/raw/raw-config.cpp
+++ b/src/usb-pad/raw/raw-config.cpp
@@ -283,7 +283,7 @@ void populate(HWND hW, RawDlgConfig *cfg)
 		HidP_GetCaps(pPreparsedData, &caps);
 
 		if(caps.UsagePage == HID_USAGE_PAGE_GENERIC && 
-			caps.Usage == HID_USAGE_GENERIC_JOYSTICK)
+			(caps.Usage == HID_USAGE_GENERIC_JOYSTICK || caps.Usage == HID_USAGE_GENERIC_GAMEPAD))
 		{
 			OSDebugOut(TEXT("Joystick found %04X:%04X\n"), attr.VendorID, attr.ProductID);
 			std::wstring strPath(didData->DevicePath);
diff --git a/src/usb-pad/raw/usb-pad-raw.cpp b/src/usb-pad/raw/usb-pad-raw.cpp
index 4494885c..805c3335 100644
--- a/src/usb-pad/raw/usb-pad-raw.cpp
+++ b/src/usb-pad/raw/usb-pad-raw.cpp
@@ -430,7 +430,10 @@ int RawInputPad::Open()
 		mOLWrite.hEvent = CreateEvent(0, 0, 0, 0);
 
 		HidD_GetAttributes(mUsbHandle, &(attr));
-		if (attr.VendorID != PAD_VID || attr.ProductID == 0xC262) {
+
+		bool isClassicLogitech = (attr.VendorID == PAD_VID) && (attr.ProductID != 0xC262);
+		bool isKeyboardmania = (attr.VendorID == 0x0507) && (attr.ProductID == 0x0010);
+		if (!isClassicLogitech && !isKeyboardmania) {
 			fwprintf(stderr, TEXT("USBqemu: Vendor is not Logitech or wheel is G920. Not sending force feedback commands for safety reasons.\n"));
 			mDoPassthrough = 0;
 			Close();