diff --git a/nnn.1 b/nnn.1
index 6e7915bf..9a9b37a4 100644
--- a/nnn.1
+++ b/nnn.1
@@ -48,7 +48,7 @@ supports the following options:
         auto-setup temporary NNN_FIFO (described in ENVIRONMENT section)
 .Pp
 .Fl A
-        disable directory auto-enter in type-to-nav mode
+        disable directory auto-enter on unique filter match
 .Pp
 .Fl "b key"
         specify bookmark key to open
diff --git a/src/nnn.c b/src/nnn.c
index 6dfcb777..eb7d6e59 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -7143,10 +7143,10 @@ nochange:
 					goto nochange;
 				}
 
-				if (strcmp(path, newpath) == 0)
-					break;
 				if (g_state.selbm == 1) /* Allow filtering in bookmarks directory */
 					presel = FILTER;
+				if (strcmp(path, newpath) == 0)
+					break;
 			}
 
 			/* In list mode, retain the last file name to highlight it, if possible */
@@ -8163,7 +8163,7 @@ static void usage(void)
 #ifndef NOFIFO
 		" -a      auto NNN_FIFO\n"
 #endif
-		" -A      disable dir auto-enter\n"
+		" -A      no dir auto-enter during filter\n"
 		" -b key  open bookmark key (trumps -s/S)\n"
 		" -c      cli-only NNN_OPENER (trumps -e)\n"
 		" -C      8-color scheme\n"