src/nnn.c | 4 ++--

diff --git a/src/nnn.c b/src/nnn.c
index b0dae5b7b3a30c59fcbf16421eba8b298a257a3e..53d09f1e31ee21b2ec3dc6c90760a7e927c9b0b6 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -7171,9 +7171,9 @@ 				save_session(TRUE, NULL);
 #endif
 
 			/* CD on Quit */
-			if (sel == SEL_QUITCD || getenv("NNN_TMPFILE")) {
+			if ((sel == SEL_QUITCD) || getenv("NNN_TMPFILE")) {
 				write_lastdir(path);
-				if (g_state.picker)
+				if ((sel == SEL_QUITCD) && g_state.picker)
 					selbufpos = 0;
 			}