diff --git a/ChangeLog b/ChangeLog
index 87bf35f9fa20cb3fdd00f8de2bdd040856c11c1e..e9be9aac5848e398b010c5118d7a9bb89e27e54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-08-16 - Silvio Rhatto <rhatto@riseup.net>
 
+	Edit: Unset RELATIVE_PATH before encrypting file
+
 	New 'cp' action
 
 	Reset 'expiry' on keyringer_check_expiration, reported and fixed
diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit
index a5f14d41d61611eda9aceebfa6423157d09da177..c9f3f1268913c454227277680ce83f8647106bff 100755
--- a/lib/keyringer/actions/edit
+++ b/lib/keyringer/actions/edit
@@ -59,9 +59,9 @@ wait
 echo "Press any key when done using the file and you're sure that $APPNAME is closed."
 read -s -n 1
 
-# Encrypt again
+# Encrypt again. Unset RELATIVE_PATH as it was already used to determine FILE path
 export KEYRINGER_ADD_EXTENSION=false
-keyringer_exec encrypt "$BASEDIR" "$FILE" "$TMPWORK"
+RELATIVE_PATH="" keyringer_exec encrypt "$BASEDIR" "$FILE" "$TMPWORK"
 
 # Check exit status
 errcrypt="$?"