diff --git a/shfm b/shfm
index 86040fe..f38a66b 100755
--- a/shfm
+++ b/shfm
@@ -137,7 +137,7 @@ list_print() {
     mid=$((bottom / 4 < 5 ? 1 : bottom / 4))
 
     case $# in
-        1) [ -e "$1" ] || set -- empty
+        1) [ -e "$1" ] || [ "$1" = 'no results' ] || set -- empty
     esac
 
     case $hist in
@@ -359,7 +359,7 @@ main() {
 
                 # word splitting and globbing intentional
                 # shellcheck disable=2086
-                set -- $ans*
+                set -- "$ans"*
 
                 case $1$# in
                     "$ans*1") set -- 'no results'