diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh
index c2acfced5..090414ae6 100644
--- a/usr/lib/archboot/installer/base.sh
+++ b/usr/lib/archboot/installer/base.sh
@@ -201,11 +201,13 @@ _mainmenu() {
     case $(cat "${_ANSWER}") in
         "1") if [[ "${_DESTDIR}" == "/" ]]; then
                  _abort_running_system
+                 _NEXTITEM=1
              else
                  _prepare_storagedrive
              fi ;;
         "2") if [[ "${_DESTDIR}" == "/" ]]; then
                  _abort_running_system
+                 _NEXTITEM=2
              else
                  _install_packages
              fi ;;
diff --git a/usr/lib/archboot/installer/bcachefs.sh b/usr/lib/archboot/installer/bcachefs.sh
index e1c1be0c4..359c80db6 100644
--- a/usr/lib/archboot/installer/bcachefs.sh
+++ b/usr/lib/archboot/installer/bcachefs.sh
@@ -112,7 +112,10 @@ _bcfs_raid_level() {
         else
             # replicas
             #shellcheck disable=SC2086
-            _dialog --no-cancel --title " Replication Level " --menu "" 9 30 5 "2" "Level 2" "3" "Level 3" "> CUSTOM" "Custom Level" 2>"${_ANSWER}" || return 1
+            _dialog --no-cancel --title " Replication Level " --menu "" 9 30 5 \
+                "2" "Level 2" \
+                "3" "Level 3" \
+                "> CUSTOM" "Custom Level" 2>"${_ANSWER}" || return 1
             _BCFS_REP_COUNT=$(cat "${_ANSWER}")
             if [[ ${_BCFS_REP_COUNT} == "> CUSTOM" ]]; then
                 _dialog  --inputbox "Enter custom replication level (number):" 8 65 \