diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig
index d874975428..f3df56a6c5 100644
--- a/src/ec/lenovo/h8/Kconfig
+++ b/src/ec/lenovo/h8/Kconfig
@@ -40,6 +40,10 @@ config H8_FN_KEY_AS_VBOOT_RECOVERY_SW
 	  If VBOOT is enabled, press Fn-Key at power on to force a recovery mode
 	  boot instead of regular FW_MAIN_x boot.
 
+config H8_HAS_PRIMARY_FN_KEYS
+	bool
+	default n
+
 endif
 
 config H8_DOCK_EARLY_INIT
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 2b959ceea1..3a99b52dd8 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -86,6 +86,14 @@ static void h8_sticky_fn(int on)
 		ec_clr_bit(0x0, 3);
 }
 
+static void f1_to_f12_as_primary(int on)
+{
+	if (on)
+		ec_set_bit(0x3b, 3);
+	else
+		ec_clr_bit(0x3b, 3);
+}
+
 static void h8_log_ec_version(void)
 {
 	char ecfw[17];
@@ -334,6 +342,12 @@ static void h8_enable(struct device *dev)
 		val = 0;
 	h8_sticky_fn(val);
 
+	if (CONFIG(H8_HAS_PRIMARY_FN_KEYS)) {
+		if (get_option(&val, "f1_to_f12_as_primary") != CB_SUCCESS)
+			val = 1;
+		f1_to_f12_as_primary(val);
+	}
+
 	if (get_option(&val, "first_battery") != CB_SUCCESS)
 		val = PRIMARY_BATTERY;
 	h8_charge_priority(val);