diff --git a/src/modules/grub/main.py b/src/modules/grub/main.py
index 7246320a8..a5055224a 100644
--- a/src/modules/grub/main.py
+++ b/src/modules/grub/main.py
@@ -34,6 +34,9 @@ def install_grub(boot_loader, fw_type):
             file_name_sanitizer = str.maketrans(" /", "_-")
             efi_bootloader_id = distribution.translate(file_name_sanitizer)
         check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)])
+        # Workaround for some UEFI firmwares
+        chroot_call(["mkdir", "-p", "{!s}/EFI/boot".format(efi_directory)])])
+        chroot_call(["cp", "{!s}/EFI/{!s}/grubx64.efi".format(efi_directory,efi_bootloader_id), "{!s}/EFI/boot/bootx64.efi".format(efi_directory)])
     else:
         install_path = boot_loader["installPath"]
         check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path])