diff --git a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend b/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend
new file mode 100644
index 00000000..c6904ef0
--- /dev/null
+++ b/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend
@@ -0,0 +1,11 @@
+# The Intel provided Fast Boot Firmware may not initialize the USB keyboard
+# before launching the grub.efi payload. Ensure GRUB has keyboard control by
+# building in the usb, usb_keyboard, and ohci modules.
+
+do_mkimage() {
+	./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
+	               -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
+	               boot linux ext2 fat serial part_msdos part_gpt normal efi_gop \
+	               usb usb_keyboard ohci
+}
+