diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec
index ef4564d..f08fe47 100644
--- a/rpm_spec/core-dom0-linux.spec
+++ b/rpm_spec/core-dom0-linux.spec
@@ -155,7 +155,7 @@ install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 install -m 644 system-config/00-qubes-ignore-devices.rules $RPM_BUILD_ROOT/etc/udev/rules.d/
 install -m 644 system-config/60-persistent-storage.rules $RPM_BUILD_ROOT/etc/udev/rules.d/
 install -m 644 -D system-config/disable-lesspipe.sh $RPM_BUILD_ROOT/etc/profile.d/zz-disable-lesspipe.sh
-install -m 755 -D system-config/kernel-grub2.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/90-grub2.install
+install -m 755 -D system-config/kernel-grub2.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/80-grub2.install
 install -m 755 -D system-config/kernel-xen-efi.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/90-xen-efi.install
 install -m 755 -D system-config/kernel-remove-bls.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/99-remove-bls.install
 install -m 644 -D system-config/75-qubes-dom0.preset \
@@ -293,7 +293,7 @@ chmod -x /etc/grub.d/10_linux
 %{_mandir}/man1/qubes-*.1*
 
 %files kernel-install
-/usr/lib/kernel/install.d/90-grub2.install
+/usr/lib/kernel/install.d/80-grub2.install
 /usr/lib/kernel/install.d/90-xen-efi.install
 /usr/lib/kernel/install.d/99-remove-bls.install
 
diff --git a/system-config/kernel-xen-efi.install b/system-config/kernel-xen-efi.install
index 58fe202..83ef368 100755
--- a/system-config/kernel-xen-efi.install
+++ b/system-config/kernel-xen-efi.install
@@ -9,7 +9,7 @@ ESP_MOUNTPOINT=/boot/efi
 
 EFI_DIR=$(efibootmgr -v 2>/dev/null | awk '
         /^BootCurrent:/ { current=$2; }
-        /^Boot....\* / { 
+        /^Boot....\* .*xen\.efi/ { 
             if ("Boot" current "*" == $1) {
                 sub(".*File\\(", "");
                 sub("\\\\xen.efi\\).*", "");