diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg
index 7e5195e..611f254 100644
--- a/archiso/grub/grub.cfg
+++ b/archiso/grub/grub.cfg
@@ -78,16 +78,16 @@ menuentry "CachyOS Legacy Hardware (GPU nomodeset)" --class arch --class gnu-lin
 
 if [ "${grub_platform}" == "efi" ]; then
     if [ "${grub_cpu}" == "x86_64" ]; then
-        menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
+        menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool {
             set gfxpayload=800x600,1024x768
             linux /boot/memtest86+/memtest.efi
         }
-        menuentry "UEFI Shell" {
+        menuentry "UEFI Shell" --class efi {
             insmod chain
             chainloader /shellx64.efi
         }
     elif [ "${grub_cpu}" == "i386" ]; then
-        menuentry "UEFI Shell" {
+        menuentry "UEFI Shell" --class efi {
             insmod chain
             chainloader /shellia32.efi
         }