diff --git a/README.md b/README.md
index c047642c..0d395052 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <a href="https://repology.org/metapackage/nnn"><img src="https://repology.org/badge/tiny-repos/nnn.svg" alt="Availability"></a>
 <a href="https://travis-ci.org/jarun/nnn"><img src="https://img.shields.io/travis/jarun/nnn/master.svg?label=travis" alt="Travis Status" /></a>
 <a href="https://circleci.com/gh/jarun/workflows/nnn"><img src="https://img.shields.io/circleci/project/github/jarun/nnn.svg?label=circleci" alt="CircleCI Status" /></a>
-<a href="https://en.wikipedia.org/wiki/Privacy-invasive_software"><img src="https://img.shields.io/badge/privacy-aware-orange" alt="Privacy Awareness" /></a>
+<a href="https://en.wikipedia.org/wiki/Privacy-invasive_software"><img src="https://img.shields.io/badge/privacy-aware-brown" alt="Privacy Awareness" /></a>
 <a href="https://github.com/jarun/nnn/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-BSD%202--Clause-yellow.svg?maxAge=2592000" alt="License" /></a>
 </p>
 
diff --git a/src/nnn.c b/src/nnn.c
index 758f06dd..55278ccb 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -4958,10 +4958,11 @@ nochange:
 			if (!ndents && (sel == SEL_OPENWITH || sel == SEL_RENAME))
 				break;
 
-			switch (sel) {
-			case SEL_ARCHIVE:
+			if (sel != SEL_OPENWITH)
 				endselection(path, newpath);
 
+			switch (sel) {
+			case SEL_ARCHIVE:
 				r = get_input(messages[MSG_CUR_SEL_OPTS]);
 				if (r == 's') {
 					if (!selsafe()) {
@@ -5106,7 +5107,6 @@ nochange:
 					mkpath(path, tmp, newpath);
 					r = xmktree(newpath, TRUE);
 				} else if (r == 's' || r == 'h') {
-					endselection(path, newpath);
 
 					if (tmp[0] == '@' && tmp[1] == '\0')
 						tmp[0] = '\0';