diff --git a/src/tomb b/src/tomb
index 40af797..6a0cada 100755
--- a/src/tomb
+++ b/src/tomb
@@ -758,6 +758,7 @@ mount_tomb() {
 
     # set up variables to be used
     # the full path is made with $tombdir/$tombfile
+
     local tombkey
     local tombfile
     local tombdir
@@ -865,6 +866,12 @@ mount_tomb() {
 	    rmdir $tombkeydir
 	fi
 
+	# if key was from stdin delete temp file and dir
+	if [ $tombkeydir ]; then
+	    ${WIPE[@]} ${tombkey}
+	    rmdir $tombkeydir
+	fi
+
 	if [ -r /dev/mapper/${mapper} ]; then
 	    break;  # password was correct
 	fi