diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp
index c4bcb26070..1f8e6ec93e 100644
--- a/rpcs3/Input/mm_joystick_handler.cpp
+++ b/rpcs3/Input/mm_joystick_handler.cpp
@@ -385,7 +385,7 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
 		return connection::connected;
 	}
 	default:
-		break;
+		return connection::disconnected;
 	}
 
 	return connection::no_data;
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index f21e1db444..7102e2e649 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -1445,6 +1445,7 @@ void pad_settings_dialog::ChangeHandler()
 	{
 #ifdef _WIN32
 	case pad_handler::xinput:
+	case pad_handler::mm:
 #endif
 	case pad_handler::ds3:
 	case pad_handler::ds4: