diff --git a/fzf-completion.bash b/fzf-completion.bash
index e52a8f94..7e67d3be 100644
--- a/fzf-completion.bash
+++ b/fzf-completion.bash
@@ -53,8 +53,10 @@ _fzf_generic_completion() {
       matches=${matches% }
       if [ -n "$matches" ]; then
         COMPREPLY=( "$matches" )
-        return 0
+      else
+        COMPREPLY=( "$cur" )
       fi
+      return 0
     fi
   fi
 }
@@ -81,7 +83,7 @@ complete -F _fzf_opts_completion fzf
 
 # Directory
 for cmd in "cd pushd rmdir"; do
-  complete -F _fzf_dir_completion -o default $cmd
+  complete -F _fzf_dir_completion -o bashdefault $cmd
 done
 
 # File
@@ -90,7 +92,7 @@ for cmd in "
   emacs ex file ftp g++ gcc gvim head hg java
   javac ld less more mvim patch perl python ruby
   sed sftp sort source tail tee uniq vi view vim wc"; do
-  complete -F _fzf_file_completion -o default $cmd
+  complete -F _fzf_file_completion -o bashdefault $cmd
 done
 
 # Anything
@@ -99,7 +101,7 @@ for cmd in "
   find git grep gunzip gzip hg jar
   ln ls mv open rm rsync scp
   svn tar unzip zip"; do
-  complete -F _fzf_all_completion -o default $cmd
+  complete -F _fzf_all_completion -o bashdefault $cmd
 done
 
 bind '"\e\e": complete'