diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index 7a502b5853..f7d78e069d 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -385,6 +385,11 @@ config PC_KEYBOARD_LAYOUT_DE
 	depends on PC_KEYBOARD
 	default n
 
+config PC_KEYBOARD_TRANSLATION
+	bool "Enable or Disable translation in PC keyboard set 2 on exit"
+	depends on PC_KEYBOARD
+	default y
+
 endmenu
 
 menu "Drivers"
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index a695723a06..952f5f1456 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -658,7 +658,7 @@ void keyboard_disconnect(void)
 	/* Nobody but us seems to still use scancode set #1.
 	   So try to hand over with more modern settings. */
 	set_scancode_set(2);
-	i8042_set_kbd_translation(false);
+	i8042_set_kbd_translation(CONFIG(LP_PC_KEYBOARD_TRANSLATION));
 
 	/* Send keyboard disconnect command */
 	i8042_cmd(I8042_CMD_DIS_KB);