src/nnn.c | 8 +++-----

diff --git a/src/nnn.c b/src/nnn.c
index 133660d2141554373a1c70defaa173b6e71ee9ff..4b27a2ee098f387c7b3ca81db9637c3b3f65ef05 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -2024,12 +2024,10 @@ 		c = getch();
 		//DPRINTF_D(c);
 		//DPRINTF_S(keyname(c));
 
-		/* Clear previous filter when manually starting */
-		if (c == FILTER)
-			clearfilter();
-
-		if (presel == MSGWAIT)
+		if (c == ERR && presel == MSGWAIT)
 			c = (cfg.filtermode) ? FILTER : CONTROL('L');
+		else if (c == FILTER) /* Clear previous filter when manually starting */
+			clearfilter();
 	}
 
 	if (c == -1) {