diff --git a/src/browser.c b/src/browser.c
index 814753f7f00012ab1d2f29317e714af5ce0aab7b..d63975543393653492da12ca24edbfd1f9fd087c 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -230,9 +230,7 @@ char *do_browser(char *path)
 			/* TRANSLATORS: This is a prompt. */
 			browser_refresh, _("Go To Directory"));
 
-	    /* If the directory begins with a newline (i.e. an
-	     * encoded null), treat it as though it's blank. */
-	    if (i < 0 || *answer == '\n') {
+	    if (i < 0) {
 		statusbar(_("Cancelled"));
 		continue;
 	    }
diff --git a/src/files.c b/src/files.c
index 205f18edf038e19ac01680abcb2ea41ac8dadac1..55ab507bcda7fe6c8a3664d21e2491bb29a47a54 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1098,10 +1098,8 @@ void do_insertfile(void)
 		"./");
 
 	/* If we're in multibuffer mode and the filename or command is
-	 * blank, open a new buffer instead of canceling.  If the
-	 * filename or command begins with a newline (i.e. an encoded
-	 * null), treat it as though it's blank. */
-	if (i == -1 || (!ISSET(MULTIBUFFER) && (i == -2 || *answer == '\n'))) {
+	 * blank, open a new buffer instead of canceling. */
+	if (i == -1 || (i == -2 && !ISSET(MULTIBUFFER))) {
 	    statusbar(_("Cancelled"));
 	    break;
 	} else {
@@ -2236,9 +2234,7 @@ int do_writeout(bool exiting)
 #endif
 		);
 
-	/* If the filename or command begins with a newline (i.e. an
-	 * encoded null), treat it as though it's blank. */
-	if (i < 0 || *answer == '\n') {
+	if (i < 0) {
 	    statusbar(_("Cancelled"));
 	    break;
 	} else {