diff --git a/src/password-store.sh b/src/password-store.sh
index 657f0e5cdf3eaccd9a8b58199b7986c67c74e26c..c3824f95314b43207a46583c1d2e1215d080a7fb 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -343,9 +343,9 @@ cmd_find() {
 		echo "Usage: $PROGRAM $COMMAND pass-names..."
 		exit 1
 	fi
-	local terms="$*"
-	echo "Search Terms: $terms"
-	tree -C -l --noreport -P "*${terms// /*|*}*" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg$//'
+	IFS="," eval 'echo "Search Terms: $*"'
+	local terms="*$(printf '%s*|*' "$@")"
+	tree -C -l --noreport -P "${terms%|*}" --prune --matchdirs --ignore-case "$PREFIX" | tail -n +2 | sed 's/\.gpg$//'
 }
 
 cmd_grep() {