diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index c50bb7c811..08282a6a05 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -223,9 +223,9 @@ void EmuScreen::update(InputState &input) {
 		{PAD_BUTTON_SELECT, CTRL_SELECT},
 	};
 
-	for (int i = 0; i < 12; i++) {
-		pressed |= input.pad_buttons_down & mapping[i][0];
-	}
+	for (int i = 0; i < 12; i++)
+		if (input.pad_buttons_down & mapping[i][0])
+			pressed |= mapping[i][1];
 
 	// Modern key mapping
 	for (int i = 0; i < MAX_KEYQUEUESIZE; i++) {
diff --git a/lang b/lang
index 92e5e45e31..b05f3f8cac 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit 92e5e45e316f73710882bf82ef8fe43f5192d0f2
+Subproject commit b05f3f8cac2f7097cac0d5b2d2526614bfda7a81
diff --git a/native b/native
index 3db24e97c1..d28b58a203 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 3db24e97c11ba5639845ad827afca90094f88943
+Subproject commit d28b58a203dd7fe51b88318b18af83675fa6745d
diff --git a/pspautotests b/pspautotests
index 8b0c30efe5..d1038e00bd 160000
--- a/pspautotests
+++ b/pspautotests
@@ -1 +1 @@
-Subproject commit 8b0c30efe52e0c799a99a632e5e743a56375d3ec
+Subproject commit d1038e00bdcf48e2ab057616bb2ec973980a7b3f