diff --git a/ChangeLog b/ChangeLog
index 17ef304a6..6d5f55d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-09  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 11836: Src/Zle/compcore.c, Src/Zle/complist.c: fix for
+ 	menu-completion when another completion came right after it
+	
 	* 11833: Completion/Core/_path_files, Src/Zle/computil.c: improve
  	_path_files, move some code into C, try to optimise glob patterns
  	and immediately accept exact directory matches
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index ad048718d..7497d03b4 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -512,6 +512,7 @@ after_complete(Hookdef dummy, int *dat)
 	if ((ret = runhookdef(MENUSTARTHOOK, (void *) &cdat))) {
 	    dat[1] = 0;
 	    menucmp = menuacc = 0;
+	    minfo.cur = NULL;
 	    if (ret == 2) {
 		fixsuffix();
 		cs = 0;
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 622219aaf..cbc39266f 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1778,6 +1778,7 @@ domenuselect(Hookdef dummy, Chdata dat)
 	    s->origcs = origcs;
 	    s->origll = origll;
 	    menucmp = menuacc = hasoldlist = 0;
+	    minfo.cur = NULL;
 	    fixsuffix();
 	    validlist = 0;
 	    amatches = pmatches = lastmatches = NULL;