1 files changed, 3 insertions, 1 deletions
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 0d93b8727..6870bbcd9 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -665,7 +665,9 @@ do_ambiguous(void)
 	 * prefix was inserted, return now, bypassing the list-displaying  *
 	 * code.  On the way, invalidate the list and note that we don't   *
 	 * want to enter an AUTO_MENU imediately.                          */
-	if (uselist == 3 && la) {
+	if ((uselist == 3 ||
+	     (!uselist && isset(BASHAUTOLIST) && isset(LISTAMBIGUOUS))) &&
+	    la) {
 	    int fc = fromcomp;
 
 	    invalidatelist();