diff --git a/yt b/yt
index fe4d50e..5d48112 100755
--- a/yt
+++ b/yt
@@ -144,7 +144,7 @@ pick() { # Pick a video to play from a playlist of videos
 		exit 78 # sysexits.h(3) EX_CONFIG
 	fi
 
-	while test -f "$YT_PL_DIR/$1.m3u"; do
+	if test -f "$YT_PL_DIR/$1.m3u"; then
 		file="$YT_PL_DIR/$1.m3u"
 
 		for line in $(lines "$file"); do
@@ -161,8 +161,7 @@ pick() { # Pick a video to play from a playlist of videos
 				list="$(printf '%s\n%s' "$list" "$(grep "$line" "$cachefile")")"
 			fi
 		done
-		shift
-	done
+	fi
 
 	chosen="$(printf '%s\n' "$list" | $YTPICK | sed -e 's/.*\[//g' -e 's/\]//g')"
 	printf "%s: %s: Playing stream.\n" "$argv0" "$chosen" 1>&2