diff --git a/90zfsbootmenu/zfs-chroot.sh b/90zfsbootmenu/zfs-chroot.sh
index 37f7bc8a..cb63e0ff 100755
--- a/90zfsbootmenu/zfs-chroot.sh
+++ b/90zfsbootmenu/zfs-chroot.sh
@@ -43,7 +43,7 @@ if mountpoint="$( allow_rw=yes mount_zfs "${selected}" )"; then
     echo -e "$( colorize orange "${selected}") is mounted ${writemode}, /tmp is shared and read/write\n"
 
     # regardless of shell, set PS1
-    if ! env "PS1=$( colorize orange "${selected}") > " chroot "${mountpoint}" "${_SHELL}" "${chroot_extra}" ; then
+    if ! env "PS1=$( colorize orange "${selected}") \w > " chroot "${mountpoint}" "${_SHELL}" "${chroot_extra}" ; then
       zdebug "chroot ${selected}:${_SHELL} returned code $?"
     fi
   fi
diff --git a/90zfsbootmenu/zfsbootmenu-lib.sh b/90zfsbootmenu/zfsbootmenu-lib.sh
index a27360eb..d397db53 100755
--- a/90zfsbootmenu/zfsbootmenu-lib.sh
+++ b/90zfsbootmenu/zfsbootmenu-lib.sh
@@ -2014,7 +2014,7 @@ emergency_shell() {
 
   echo -n "Launching emergency shell: "
   echo -e "${message}\n"
-  env "PS1=$( colorize orange "zfsbootmenu") > " /bin/bash --rcfile <( test -f /lib/zfsbootmenu-lib.sh && echo "source /lib/zfsbootmenu-lib.sh" )
+  env "PS1=$( colorize orange "zfsbootmenu") \w > " /bin/bash --rcfile <( test -f /lib/zfsbootmenu-lib.sh && echo "source /lib/zfsbootmenu-lib.sh" )
 }
 
 # prints: nothing
diff --git a/90zfsbootmenu/zfsbootmenu-preview.sh b/90zfsbootmenu/zfsbootmenu-preview.sh
index 7109cdb4..9c1d4f37 100755
--- a/90zfsbootmenu/zfsbootmenu-preview.sh
+++ b/90zfsbootmenu/zfsbootmenu-preview.sh
@@ -11,25 +11,27 @@ BOOTFS="${2}"
 IFS=' ' read -r _fs selected_kernel _initramfs <<<"$( select_kernel "${ENV}")"
 selected_kernel="${selected_kernel##*/}"
 
+if [ "${BOOTFS}" = "${ENV}" ]; then
+  _EXTRAS+=( "default," )
+fi
+
+if be_has_encroot "${ENV}" >/dev/null; then
+  _EXTRAS+=( "encrypted," )
+fi
+
 pool="${ENV%%/*}"
 if is_writable "${pool}" ; then
-  _readonly="r/w"
+  _EXTRAS+=( "r/w" )
   _COLOR="red"
 else
-  _readonly="r/o"
+  _EXTRAS+=( "r/o" )
   _COLOR="green"
 fi
 
-if [ "${BOOTFS}" = "${ENV}" ]; then
-  _DEFAULT="default, "
-else
-  _DEFAULT=""
-fi
-
 selected_arguments="$( load_be_cmdline "${ENV}" )"
 selected_arguments="$( center_string "$( load_be_cmdline "${ENV}" )" )"
 
-selected_env_str="$( center_string "${ENV} (${_DEFAULT}${_readonly}) - ${selected_kernel}" )"
+selected_env_str="$( center_string "${ENV} (${_EXTRAS[*]}) - ${selected_kernel}" )"
 
 # colorize doesn't automatically add a newline
 if [ -f "${BASE}/have_errors" ]; then