diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille
index 9298b90..91c4a00 100755
--- a/usr/local/bin/bastille
+++ b/usr/local/bin/bastille
@@ -134,7 +134,7 @@ esac
 case "${CMD}" in
 bootstrap|cmd|console|convert|cp|create)
     ;;
-destroy|export|htop|import|limits|list)
+destroy|edit|export|htop|import|limits|list)
     ;;
 pkg|rdr|rename|restart|service|start|stop|sysrc)
     ;;
diff --git a/usr/local/share/bastille/edit.sh b/usr/local/share/bastille/edit.sh
index 9ce3fb8..8f741b1 100644
--- a/usr/local/share/bastille/edit.sh
+++ b/usr/local/share/bastille/edit.sh
@@ -57,10 +57,10 @@ if [ -z "${EDITOR}" ]; then
 fi
 
 if [ "${TARGET}" = 'ALL' ]; then
-    JAILS=$(jls name)
+    JAILS=$(bastille list jails)
 fi
 if [ "${TARGET}" != 'ALL' ]; then
-    JAILS=$(jls name | awk "/^${TARGET}$/")
+    JAILS=$(bastille list jails | awk "/^${TARGET}$/")
 fi
 
 for _jail in ${JAILS}; do