diff --git a/Common/UI/View.h b/Common/UI/View.h
index 54de1420aa8f..db321d1d3949 100644
--- a/Common/UI/View.h
+++ b/Common/UI/View.h
@@ -899,7 +899,7 @@ class CheckBox : public ClickableItem {
 
 class CollapsibleHeader : public CheckBox {
 public:
-	CollapsibleHeader(bool *toggle, const std::string &text, LayoutParams *layoutParams = nullptr);
+	CollapsibleHeader(bool *open, const std::string &text, LayoutParams *layoutParams = nullptr);
 	void Draw(UIContext &dc) override;
 	void GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert, float &w, float &h) const override;
 	void GetContentDimensions(const UIContext &dc, float &w, float &h) const override;
@@ -907,6 +907,9 @@ class CollapsibleHeader : public CheckBox {
 	Point GetFocusPosition(FocusDirection dir) const override;
 
 	void SetHasSubitems(bool hasSubItems) { hasSubItems_ = hasSubItems; }
+	void SetOpenPtr(bool *open) {
+		toggle_ = open;
+	}
 private:
 	bool hasSubItems_ = true;
 };
diff --git a/Common/UI/ViewGroup.cpp b/Common/UI/ViewGroup.cpp
index fbdb582a217e..2b4f4ec5a192 100644
--- a/Common/UI/ViewGroup.cpp
+++ b/Common/UI/ViewGroup.cpp
@@ -1175,11 +1175,12 @@ StickyChoice *ChoiceStrip::Choice(int index) {
 }
 
 CollapsibleSection::CollapsibleSection(const std::string &title, LayoutParams *layoutParams) : LinearLayout(ORIENT_VERTICAL, layoutParams) {
+	open_ = &localOpen_;
 	SetSpacing(0.0f);
 
-	heading_ = new CollapsibleHeader(&open_, title);
-	views_.push_back(heading_);
-	heading_->OnClick.Add([=](UI::EventParams &) {
+	header_ = new CollapsibleHeader(open_, title);
+	views_.push_back(header_);
+	header_->OnClick.Add([=](UI::EventParams &) {
 		// Change the visibility of all children except the first one.
 		// Later maybe try something more ambitious.
 		UpdateVisibility();
@@ -1189,12 +1190,12 @@ CollapsibleSection::CollapsibleSection(const std::string &title, LayoutParams *l
 
 void CollapsibleSection::Update() {
 	ViewGroup::Update();
-	heading_->SetHasSubitems(views_.size() > 1);
+	header_->SetHasSubitems(views_.size() > 1);
 }
 
 void CollapsibleSection::UpdateVisibility() {
 	for (size_t i = 1; i < views_.size(); i++) {
-		views_[i]->SetVisibility(open_ ? V_VISIBLE : V_GONE);
+		views_[i]->SetVisibility(*open_ ? V_VISIBLE : V_GONE);
 	}
 }
 
diff --git a/Common/UI/ViewGroup.h b/Common/UI/ViewGroup.h
index dcca7242c6dc..76918c9ed725 100644
--- a/Common/UI/ViewGroup.h
+++ b/Common/UI/ViewGroup.h
@@ -332,14 +332,20 @@ class CollapsibleSection : public LinearLayout {
 	void Update() override;
 
 	void SetOpen(bool open) {
+		*open_ = open;
+		UpdateVisibility();
+	}
+	void SetOpenPtr(bool *open) {
+		header_->SetOpenPtr(open);
 		open_ = open;
 		UpdateVisibility();
 	}
 
 private:
 	void UpdateVisibility();
-	bool open_ = true;
-	CollapsibleHeader *heading_;
+	bool localOpen_ = true;
+	bool *open_;
+	CollapsibleHeader *header_;
 };
 
 }  // namespace UI
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 78977499671e..008ef0c127ed 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -836,6 +836,7 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("AnalogTriggerThreshold", &g_Config.fAnalogTriggerThreshold, 0.75f, CfgFlag::DEFAULT),
 
 	ConfigSetting("AllowMappingCombos", &g_Config.bAllowMappingCombos, false, CfgFlag::DEFAULT),
+	ConfigSetting("StrictComboOrder", &g_Config.bStrictComboOrder, false, CfgFlag::DEFAULT),
 
 	ConfigSetting("LeftStickHeadScale", &g_Config.fLeftStickHeadScale, 1.0f, CfgFlag::PER_GAME),
 	ConfigSetting("RightStickHeadScale", &g_Config.fRightStickHeadScale, 1.0f, CfgFlag::PER_GAME),
diff --git a/Core/Config.h b/Core/Config.h
index 28e186725a53..a7a8c039f815 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -407,6 +407,7 @@ struct Config {
 
 	// Sets whether combo mapping is enabled.
 	bool bAllowMappingCombos;
+	bool bStrictComboOrder;
 
 	bool bMouseControl;
 	bool bMapMouse; // Workaround for mapping screen:|
diff --git a/Core/ControlMapper.cpp b/Core/ControlMapper.cpp
index 17c8e9ff9e9e..d75508ea2b38 100644
--- a/Core/ControlMapper.cpp
+++ b/Core/ControlMapper.cpp
@@ -365,7 +365,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 					continue;
 				}
 				// Stop reverse ordering from triggering.
-				if (iter->second.timestamp < curTime) {
+				if (g_Config.bStrictComboOrder && iter->second.timestamp < curTime) {
 					all = false;
 					break;
 				} else {
@@ -416,7 +416,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 
 				if (iter != curInput_.end()) {
 					// Stop reverse ordering from triggering.
-					if (iter->second.timestamp < curTime) {
+					if (g_Config.bStrictComboOrder && iter->second.timestamp < curTime) {
 						product = 0.0f;
 						break;
 					} else {
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index cf4f75d8ffdf..a3646f77ab7a 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -262,6 +262,7 @@ void ControlMappingScreen::CreateViews() {
 		return UI::EVENT_DONE;
 	});
 	leftColumn->Add(new CheckBox(&g_Config.bAllowMappingCombos, km->T("Allow combo mappings")));
+	leftColumn->Add(new CheckBox(&g_Config.bStrictComboOrder, km->T("Strict combo input order")));
 
 	leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f)));
 	AddStandardBack(leftColumn);
@@ -280,22 +281,22 @@ void ControlMappingScreen::CreateViews() {
 	struct Cat {
 		const char *catName;
 		int firstKey;
-		bool openByDefault;
+		bool *open;
 	};
 	// Category name, first input from psp_button_names.
 	static const Cat cats[] = {
-		{"Standard PSP controls", CTRL_UP, true},
-		{"Control modifiers", VIRTKEY_ANALOG_ROTATE_CW, true},
-		{"Emulator controls", VIRTKEY_FASTFORWARD, true},
-		{"Extended PSP controls", VIRTKEY_AXIS_RIGHT_Y_MAX, false},
+		{"Standard PSP controls", CTRL_UP, &categoryToggles_[0]},
+		{"Control modifiers", VIRTKEY_ANALOG_ROTATE_CW, &categoryToggles_[1]},
+		{"Emulator controls", VIRTKEY_FASTFORWARD, &categoryToggles_[2]},
+		{"Extended PSP controls", VIRTKEY_AXIS_RIGHT_Y_MAX, &categoryToggles_[3]},
 	};
 
 	int curCat = -1;
 	CollapsibleSection *curSection = nullptr;
 	for (size_t i = 0; i < numMappableKeys; i++) {
 		if (curCat < (int)ARRAY_SIZE(cats) && mappableKeys[i].key == cats[curCat + 1].firstKey) {
-			if (curCat >= 0 && !cats[curCat].openByDefault) {
-				curSection->SetOpen(false);
+			if (curCat >= 0) {
+				curSection->SetOpenPtr(cats[curCat].open);
 			}
 			curCat++;
 			curSection = rightColumn->Add(new CollapsibleSection(km->T(cats[curCat].catName)));
@@ -307,8 +308,8 @@ void ControlMappingScreen::CreateViews() {
 		mapper->SetTag(StringFromFormat("KeyMap%s", mappableKeys[i].name));
 		mappers_.push_back(mapper);
 	}
-	if (curCat >= 0 && curSection && !cats[curCat].openByDefault) {
-		curSection->SetOpen(false);
+	if (curCat >= 0 && curSection) {
+		curSection->SetOpenPtr(cats[curCat].open);
 	}
 
 	keyMapGeneration_ = KeyMap::g_controllerMapGeneration;
diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h
index fb70f5cc6e58..23607d9d36d4 100644
--- a/UI/ControlMappingScreen.h
+++ b/UI/ControlMappingScreen.h
@@ -39,6 +39,8 @@ class ControlMappingScreen : public UIDialogScreenWithGameBackground {
 	explicit ControlMappingScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {
 		categoryToggles_[0] = true;
 		categoryToggles_[1] = true;
+		categoryToggles_[2] = true;
+		categoryToggles_[3] = false;
 	}
 	const char *tag() const override { return "ControlMapping"; }
 
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 9b11c4da56b0..ccaa5d2ae9e1 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -728,6 +728,7 @@ Map Mouse = ‎خريطة الفأرة
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = ‎يمكنك ضغط علي زر الخروج للإلغاء.
 
 [MainMenu]
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index 49d79fd234e7..d20aef6f8588 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index 8f1d5d11ca65..892ce3d3058e 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index 3915007bfe66..da80f468b71f 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -720,6 +720,7 @@ Map Mouse = Mapejar ratolí
 Replace = Reemplaçar
 Show PSP = Mostra PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Podeu prémer ESC per cancel·lar.
 
 [MainMenu]
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index f6a6caa2bb96..21abb92b0b21 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index 44d01c10657b..e15b8ec2e854 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Du kan trykke Esc for at afbryde.
 
 [MainMenu]
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index 7f20a06e9737..578fb920972e 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -720,6 +720,7 @@ Map Mouse = Maus zuweisen
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Drücken Sie ESC zum abbrechen.
 
 [MainMenu]
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index a522261e4c5d..7346cf764955 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index 4c6f400ef0a0..4dd9e6da99ab 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -744,6 +744,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index 1a5bd35ed105..fc8eaeea064e 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -720,6 +720,7 @@ Map Mouse = Mapear ratón
 Replace = Remplazar
 Show PSP = Mostrar PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Puedes presionar ESC para cancelar.
 
 [MainMenu]
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index 16ab3b414809..7d81f89ef742 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -720,6 +720,7 @@ Map Mouse = Asignar ratón
 Replace = Reemplazar
 Show PSP = Mostrar PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Puedes presionar Esc para cancelar.
 
 [MainMenu]
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index cec44955ffae..88ef24ba3383 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index 547b9488d3a1..12e420070f70 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -720,6 +720,7 @@ Map Mouse = Kartoita hiiri
 Replace = Korvaa
 Show PSP = Näytä PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Voit peruuttaa painamalla Esc.
 
 [MainMenu]
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index 165bf884ed53..7c380e712d1d 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -720,6 +720,7 @@ Map Mouse = Assigner un contrôle de souris
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Vous pouvez presser "Échap" pour annuler.
 
 [MainMenu]
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index 0698107363bf..d42791f671b7 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index b077f2d944b7..deba5a15d319 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -720,6 +720,7 @@ Map Mouse = ΡύΘμιση ποντικού
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Μπορείτε να πατήσετε Esc για ακύρωση.
 
 [MainMenu]
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index 82b0959663c0..9324b485ec75 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index cc07adb51e1c..e6c4396d24c5 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index 50822f61fe6a..32f35889353b 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -720,6 +720,7 @@ Map Mouse = Postavi miš
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Možes pritisnuti ESC za odustati.
 
 [MainMenu]
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index c8942b24b394..05a681124e80 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -720,6 +720,7 @@ Map Mouse = Egér társítása
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Megszakításhoz használj ESC-et.
 
 [MainMenu]
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index 29aec36b8868..fc82a3be7a4d 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -720,6 +720,7 @@ Map Mouse = Tetapkan mouse
 Replace = Timpa
 Show PSP = Tampilkan PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Kamu dapat membatalkan dengan menekan ESC.
 
 [MainMenu]
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index 83fa87954578..d87263a5e177 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -721,6 +721,7 @@ Map Mouse = Mappa Mouse
 Replace = Sostituisci
 Show PSP = Mostra PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Puoi premere Esc per annullare.
 
 [MainMenu]
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index f661885cba32..ea6cafe96898 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -720,6 +720,7 @@ Map Mouse = マウスの割り当て指定
 Replace = 置き換える
 Show PSP = PSP画像を表示
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Escを押すとキャンセルできます。
 
 [MainMenu]
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index 6d0b40cfcb12..fa7044d2edf2 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index 6e00acaf51d9..715369c966d9 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -720,6 +720,7 @@ Map Mouse = 마우스 매핑
 Replace = 교체
 Show PSP = PSP 표시
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Esc를 눌러 취소할 수 있습니다.
 
 [MainMenu]
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index 41e88fd73771..717b5a92e795 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = ເຈົ້າສາມາດກົດ Esc ເພື່ອຍົກເລີກ.
 
 [MainMenu]
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index 74f259d8d8d0..be494667f3b5 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index ad594b3fa3ee..b9855937e450 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index 5e2ea5705b47..cad8955ce20d 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -720,6 +720,7 @@ Map Mouse = Muis indelen
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Druk op Esc om te annuleren.
 
 [MainMenu]
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index 57b11adb751c..c5598dc041c9 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index 513872ee6479..c63d2a37ccbe 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -725,6 +725,7 @@ Map Mouse = Mapuj mysz
 Replace = Zamień
 Show PSP = Pokaż PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Możesz zamknąć to okienko naciskając Esc.
 
 [MainMenu]
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index ba1ebbdf114d..371617828b5a 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -744,6 +744,7 @@ Map Mouse = Mapear o mouse
 Replace = Substituir
 Show PSP = Mostrar o PSP
 Standard PSP controls = Controles padrão do PSP
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Você pode pressionar o Esc pra cancelar.
 
 [MainMenu]
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index dc3be6209d86..aa4563f15aeb 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -744,6 +744,7 @@ Map Mouse = Mapear o Rato
 Replace = Substituir
 Show PSP = Mostrar a PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Podes pressionar a tecla Esc para cancelar.
 
 [MainMenu]
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index 981d6c9a4966..bf8ec1e99b79 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -721,6 +721,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index aca1610f6fb5..1cb81162c377 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -720,6 +720,7 @@ Map Mouse = Назначить мышь
 Replace = Заменить
 Show PSP = Показать вид PSP
 Standard PSP controls = Стандартное управление PSP
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Для отмены вы можете нажать Esc.
 
 [MainMenu]
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index aa561aa46219..3d90f3c0ad11 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -721,6 +721,7 @@ Map Mouse = Mappa mus
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Tryck ESC för att avbryta.
 
 [MainMenu]
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index d223ea3c5128..e9079d66f672 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -720,6 +720,7 @@ Map Mouse = Map mouse
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = You can press Esc to cancel.
 
 [MainMenu]
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index f90e16afd25d..497a40de38b7 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -726,6 +726,7 @@ Map Mouse = ตั้งค่าปุ่มเมาส์
 Replace = แทนที่
 Show PSP = แสดง PSP
 Standard PSP controls = การควบคุม PSP ขั้นพื้นฐาน
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = คุณสามารถกด ESC เพื่อยกเลิกได้
 
 [MainMenu]
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index cd292b3fa903..e96a5c3de59b 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -722,6 +722,7 @@ Map Mouse = Mouse eşleştir
 Replace = Değiştir
 Show PSP = PSP'yi Göster
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = İptal etmek için Esc'ye basabilirsiniz.
 
 [MainMenu]
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index c82fbf1c12fc..96090db50ced 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -720,6 +720,7 @@ Map Mouse = Карта миші
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = Ви можете натиснути Esc, щоб скасувати.
 
 [MainMenu]
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index 080a4ad72975..350db79adf4e 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -720,6 +720,7 @@ Map Mouse = bản đồ chuột
 Replace = Replace
 Show PSP = Show PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = bạn có thể nhấp Esc để hủy.
 
 [MainMenu]
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index bdfce2589b27..5dc21d44c697 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -720,6 +720,7 @@ Map Mouse = 鼠标映射
 Replace = 替换现有
 Show PSP = PSP 布局
 Standard PSP controls = PSP基本按键
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = 可以按下Esc键取消
 
 [MainMenu]
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index 28bb1669413b..8bd30aa977f2 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -720,6 +720,7 @@ Map Mouse = 對應滑鼠
 Replace = 取代
 Show PSP = 顯示 PSP
 Standard PSP controls = Standard PSP controls
+Strict combo input order = Strict combo input order
 You can press ESC to cancel. = 您可以按下 ESC 取消
 
 [MainMenu]