diff --git a/src/nnn.c b/src/nnn.c
index f2cb9c98..3a920693 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3394,7 +3394,12 @@ nochange:
 			if (sel == SEL_QUITCD) {
 				/* In vim picker mode, clear selection and exit */
 				if (cfg.picker) {
-					copybufpos = 0;
+					if (copybufpos) {
+						if (cfg.pickraw) /* Reset for for raw pick */
+							copybufpos = 0;
+						else /* Clear the picker file */
+							writecp(NULL, 0);
+					}
 					dentfree(dents);
 					return;
 				}