diff --git a/src/.clang-tidy b/src/.clang-tidy
index 6a8141ab..a3d12927 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -11,5 +11,5 @@ CheckOptions:
   - key:             fuchsia-restrict-system-includes.Includes
     value:           '*,-stdint.h,-stdbool.h'
   - key:             readability-function-size.StatementThreshold
-    value:           '900'
+    value:           '925'
 ...
diff --git a/src/nnn.c b/src/nnn.c
index 2fb00345..6d0b828d 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -6287,10 +6287,14 @@ nochange:
 #endif
 			) {
 				spawn(editor, newpath, NULL, F_CLI);
+				if (cfg.filtermode) {
+					presel = FILTER;
+					clearfilter();
+				}
 				continue;
 			}
 
-			/* Get the extension for regext match */
+			/* Get the extension for regex match */
 			tmp = xextension(pent->name, pent->nlen - 1);
 #ifdef PCRE
 			if (tmp && !pcre_exec(archive_pcre, NULL, tmp,
@@ -6338,6 +6342,10 @@ nochange:
 			/* Move cursor to the next entry if not the last entry */
 			if (g_state.autonext && cur != ndents - 1)
 				move_cursor((cur + 1) % ndents, 0);
+			if (cfg.filtermode) {
+				presel = FILTER;
+				clearfilter();
+			}
 			continue;
 		case SEL_NEXT: // fallthrough
 		case SEL_PREV: // fallthrough