diff --git a/src/grub2/grub/grub.cfg b/src/grub2/grub/grub.cfg
index 012dbd1..c0a1a70 100644
--- a/src/grub2/grub/grub.cfg
+++ b/src/grub2/grub/grub.cfg
@@ -2628,13 +2628,14 @@ vt_device $root  hiso_dev
 if [ "$hiso_dev" = "tftp" ]; then
     set hiso_path=($root)
     for vtid in 0 1 2 3; do
-        if [ -f (hd$vtid,gpt2)/hiperiso/hiperiso.cpio ]; then
+        if [ -f (hd$vtid,gpt1)/hiperiso/hiperiso.cpio ]; then
             set hiso_iso_part=(hd$vtid,gpt1)
             set hiso_efi_part=(hd$vtid,gpt2)
             set hisodev=hd$vtid
             break
         fi
     done
+    set hiso_path=$hiso_iso_part/hiperiso
     loadfont ascii
 
     if [ -n "$hiso_efi_part" ]; then
@@ -2652,7 +2653,7 @@ else
     if [ "$prefix" = "(hiperisodisk)/grub" ]; then
         set hiso_path=(hiperisodisk)/hiperiso
     else
-        set hiso_path=($root)/hiperiso
+        set hiso_path=($hiso_dev,1)/hiperiso
     fi
 
     set hisodev=$hiso_dev