diff --git a/bash_completion b/bash_completion
index 5ed95dde..e550af8e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -852,10 +852,10 @@ _tilde()
 {
     local result=0
     if [[ $1 == ~* && $1 != */* ]]; then
-        compopt -o filenames 2>/dev/null
         # Try generate ~username completions
         COMPREPLY=( $( compgen -P '~' -u "${1#\~}" ) )
         result=${#COMPREPLY[@]}
+        [ $result -gt 0 ] && compopt -o filenames 2>/dev/null
     fi
     return $result
 }