diff --git a/.bin/passmenu-edit b/.bin/passmenu-edit
index bf3bd35..2ab209d 100755
--- a/.bin/passmenu-edit
+++ b/.bin/passmenu-edit
@@ -7,7 +7,9 @@ prefix=${PASSWORD_STORE_DIR-~/.password-store}
 while true
 do
 
-    unset password_files;
+    unset password_files
+    unset PASS
+    unset FOLDER
 
 
     password_files=( "$prefix"/**/*.gpg )
@@ -19,6 +21,8 @@ do
 
     EXTRA="-q ${password#*/}"
 
+    echo "$password" | fgrep -q '/' && FOLDER="${password%/*}/"
+
     echo "---------"
     echo "Selected: $password"
     PASS="$(pass "$password")"
@@ -32,7 +36,7 @@ do
 
     case $REPLY in
         [eE]) echo "Editing $password."; pass edit "$password"; ;;
-        [rR]) echo -n "Rename to: "; read; [ ! -z "$REPLY" ] && pass mv "$password" "$REPLY"; ;;
+        [rR]) echo -n "Rename to: "; read -i "$FOLDER" -e REPLY; [ ! -z "$REPLY" ] && pass mv "$password" "$REPLY"; ;;
         [nN]) pass generate -i "$password" 22; ;;
         [dD]) pass rm "$password"; unset EXTRA; ;;
     esac