diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
index ca00fd874..b76e09e1a 100644
--- a/docs/tr2/CHANGELOG.md
+++ b/docs/tr2/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-1.0...develop) - ××××-××-××
+- fixed the selected keyboard/controller layout not being saved (#2830, regression from 1.0)
 
 ## [1.0](https://github.com/LostArtefacts/TRX/compare/tr2-0.10...tr2-1.0) - 2025-04-23
 - added support for The Golden Mask (#1621)
diff --git a/src/tr2/game/option/option_controls.c b/src/tr2/game/option/option_controls.c
index d1fcc0392..0d1321378 100644
--- a/src/tr2/game/option/option_controls.c
+++ b/src/tr2/game/option/option_controls.c
@@ -44,10 +44,11 @@ static void M_HandleLayoutChange(const EVENT *event, void *user_data)
     const M_PRIV *const p = user_data;
     switch (p->ui.state.backend) {
     case INPUT_BACKEND_KEYBOARD:
-        g_Config.input.keyboard_layout = p->ui.state.active_layout;
+        g_Config.input.keyboard_layout = p->ui.state.editor_state.active_layout;
         break;
     case INPUT_BACKEND_CONTROLLER:
-        g_Config.input.controller_layout = p->ui.state.active_layout;
+        g_Config.input.controller_layout =
+            p->ui.state.editor_state.active_layout;
         break;
     default:
         break;