diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh
index 6127c5b6..a0fc722e 100755
--- a/files/initrd/opt/rr/include/functions.sh
+++ b/files/initrd/opt/rr/include/functions.sh
@@ -362,7 +362,7 @@ function delCmdline() {
 # Rebooting
 # 1 - mode
 function rebootTo() {
-  local MODES="config recovery junior"
+  local MODES="config recovery junior bios memtest"
   if [ -z "${1}" ] || ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
   # echo "Rebooting to ${1} mode"
   GRUBPATH="$(dirname $(find ${PART1_PATH}/ -name grub.cfg 2>/dev/null | head -1))"
diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index 1cd0065e..1b4081d9 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -3613,9 +3613,9 @@ else
         echo "x \"$(TEXT "Reboot to RR")\"" >>"${TMP_PATH}/menu"
         echo "y \"$(TEXT "Reboot to Recovery")\"" >>"${TMP_PATH}/menu"
         echo "z \"$(TEXT "Reboot to Junior")\"" >>"${TMP_PATH}/menu"
-        if efibootmgr | grep -q "^Boot0000"; then
-          echo "b \"$(TEXT "Reboot to BIOS")\"" >>"${TMP_PATH}/menu"
-        fi
+        #if efibootmgr | grep -q "^Boot0000"; then
+        echo "b \"$(TEXT "Reboot to BIOS")\"" >>"${TMP_PATH}/menu"
+        #fi
         echo "s \"$(TEXT "Back to shell")\"" >>"${TMP_PATH}/menu"
         echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu"
 
@@ -3657,8 +3657,9 @@ else
         b)
           DIALOG --title "$(TEXT "Main menu")" \
             --infobox "$(TEXT "Reboot to BIOS")" 0 0
-          efibootmgr -n 0000 >/dev/null 2>&1
-          reboot
+          #efibootmgr -n 0000 >/dev/null 2>&1
+          #reboot
+          rebootTo bios
           exit 0
           ;;
         s)
diff --git a/files/mnt/p1/boot/grub/grub.cfg b/files/mnt/p1/boot/grub/grub.cfg
index 0123896f..24d35579 100644
--- a/files/mnt/p1/boot/grub/grub.cfg
+++ b/files/mnt/p1/boot/grub/grub.cfg
@@ -123,6 +123,15 @@ menuentry 'Configure loader' --id config {
   echo "Booting..."
 }
 
+menuentry 'Enter BIOS Setup' --id bios  {
+  fwsetup
+}
+
+menuentry 'Start Memtest86+' --id memtest {
+  echo "Loading memtest86+..."
+  linux ${prefix}/memtest 
+}
+
 if [ ${vesa_mode} = 1 ]; then
   menuentry 'Change vesa to text video mode' --id videomode {
     set vesa_mode=0
@@ -137,8 +146,3 @@ else
     configfile ${prefix}/grub.cfg
   }
 fi
-
-menuentry 'Start Memtest86+' --id memtest {
-  echo "Loading memtest86+..."
-  linux ${prefix}/memtest 
-}