diff --git a/cranspasswords.py b/cranspasswords.py
index c623880990564c45d6a2916edd3fa21dfdab6ac9..de29629cf2b319897a0752b26a40c3cc2fa7c769 100755
--- a/cranspasswords.py
+++ b/cranspasswords.py
@@ -285,7 +285,7 @@ def editor(texte, annotations=""):
     for l in annotations.split('\n'):
         f.write("# %s\n" % l.encode('utf-8'))
     f.flush()
-    proc = subprocess.Popen(os.getenv('EDITOR') + ' ' + f.name, shell=True)
+    proc = subprocess.Popen([os.getenv('EDITOR', '/usr/bin/editor'), f.name])
     os.waitpid(proc.pid, 0)
     f.seek(0)
     ntexte = f.read()
diff --git a/cranspasswords_bash_completion b/cranspasswords_bash_completion
index 1a7ea624cabadc343f49306ca0f91ba50251ae0f..d0712ac986a893c4fea3f06dd97c1b975c11a262 100644
--- a/cranspasswords_bash_completion
+++ b/cranspasswords_bash_completion
@@ -1,9 +1,5 @@
 # Fonction de notre auto completion
 
-if [[ "$EDITOR" = "" ]]; then
-    export EDITOR="nano";
-fi
-
 _cranspasswords(){
   # declaration des variables locales
   local argc first last prev cur cur_first_char opts_short opts role_dir pass_dir server server_list role_list pass_list timeout