diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp
index 1aceb59b38..4111ee2827 100644
--- a/rpcs3/Emu/Io/PadHandler.cpp
+++ b/rpcs3/Emu/Io/PadHandler.cpp
@@ -790,8 +790,6 @@ void PadHandlerBase::process()
 			}
 			continue;
 		}
-		default:
-			break;
 		}
 
 		get_mapping(m_bindings[i]);
diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h
index bc9ed60318..17f4faa241 100644
--- a/rpcs3/Emu/Io/PadHandler.h
+++ b/rpcs3/Emu/Io/PadHandler.h
@@ -58,7 +58,7 @@ using motion_fail_callback = std::function<void(std::string /*pad_name*/, motion
 class PadHandlerBase
 {
 public:
-	enum connection
+	enum class connection
 	{
 		no_data,
 		connected,
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 6b04edf30f..6c325f4a3f 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -499,7 +499,7 @@ void pad_settings_dialog::InitButtons()
 
 		if (data.has_new_data)
 		{
-			if (data.status == PadHandlerBase::disconnected)
+			if (data.status == PadHandlerBase::connection::disconnected)
 			{
 				fail_callback(data.pad_name);
 			}
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h
index 49ca0f8cc3..e6cea62a94 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.h
@@ -162,7 +162,7 @@ private:
 	std::mutex m_input_mutex;
 	struct input_callback_data
 	{
-		PadHandlerBase::connection status = PadHandlerBase::disconnected;
+		PadHandlerBase::connection status = PadHandlerBase::connection::disconnected;
 		bool has_new_data = false;
 		u16 val = 0;
 		std::string name;