diff --git a/distrobox-create b/distrobox-create
index c85251fd48..cccc619bac 100755
--- a/distrobox-create
+++ b/distrobox-create
@@ -260,6 +260,7 @@ generate_command() {
 	#
 	# Mount also the distrobox-init utility as the container entrypoint.
 	result_command="${result_command}
+		--env SHELL=${SHELL:-"/bin/bash"}
 		--env HOME=${container_user_home}
 		--volume ${container_user_home}:${container_user_home}:rslave
 		--volume ${distrobox_entrypoint_path}:/usr/bin/entrypoint:ro
diff --git a/distrobox-list b/distrobox-list
index 9daffe6deb..f37b7a3998 100755
--- a/distrobox-list
+++ b/distrobox-list
@@ -109,7 +109,7 @@ IFS='
 printf " %-12s | %-25s | %-30s | %-30s\n" "ID" "NAME" "STATUS" "IMAGE"
 for container in ${container_list}; do
 	# Check if the current container has a custom mount point for distrobox.
-	if [ -z "${container##*/usr/bin/distrobox*}" ]; then
+	if [ -z "${container##*distrobox*}" ]; then
 		# Extract the information for the single container to pretty print it
 		container_id="$(printf "%s" "${container}" | cut -d'|' -f1 | cut -c1-12)"
 		container_image="$(printf "%s" "${container}" | cut -d'|' -f2)"