diff --git a/ChangeLog b/ChangeLog
index 7b21edab9..829c39288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-05  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 17286: Src/Zle/complist.c: don't use optimised completion
+	list display code after the list has been erased or we're not
+	in menu selection anymore anyway
+
 2002-06-04  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* 17283: Src/parse.c: `func() { ... } this bit was ignored'.
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 6d10a26ce..e09734be7 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1652,7 +1652,7 @@ complistmatches(Hookdef dummy, Chdata dat)
     last_cap = (char *) zhalloc(max_caplen + 1);
     *last_cap = '\0';
 
-    if (!mnew && onlnct == nlnct && mlbeg >= 0 && mlbeg == molbeg)
+    if (!mnew && inselect && onlnct == nlnct && mlbeg >= 0 && mlbeg == molbeg)
         singledraw();
     else if (!compprintlist(mselect >= 0) || !clearflag)
 	noselect = 1;