diff --git a/rpcs3/Emu/Io/pad_config.cpp b/rpcs3/Emu/Io/pad_config.cpp
index 4fd5ec080d..fc08baff2f 100644
--- a/rpcs3/Emu/Io/pad_config.cpp
+++ b/rpcs3/Emu/Io/pad_config.cpp
@@ -8,7 +8,13 @@ extern std::string g_input_config_override;
 
 std::vector<std::string> cfg_pad::get_buttons(const std::string& str)
 {
-	std::vector<std::string> vec = fmt::split(str, {","});;
+	std::vector<std::string> vec = fmt::split(str, {","});
+
+	// Handle special case: string contains separator itself as configured value
+	if (str == "," || str.find(",,") != umax)
+	{
+		vec.push_back(",");
+	}
 
 	// Remove duplicates
 	std::sort(vec.begin(), vec.end());
diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp
index 03735f8662..c644dc52d3 100644
--- a/rpcs3/rpcs3qt/emu_settings.cpp
+++ b/rpcs3/rpcs3qt/emu_settings.cpp
@@ -213,13 +213,13 @@ bool emu_settings::ValidateSettings(bool cleanup)
 			}
 			else
 			{
-				const auto get_full_key = [&keys](const std::string& seperator) -> std::string
+				const auto get_full_key = [&keys](const std::string& separator) -> std::string
 				{
 					std::string full_key;
 					for (usz i = 0; i < keys.size(); i++)
 					{
 						full_key += keys[i];
-						if (i < keys.size() - 1) full_key += seperator;
+						if (i < keys.size() - 1) full_key += separator;
 					}
 					return full_key;
 				};