diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index bac072e..4a0e5f6 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1991,6 +1991,7 @@ complistmatches(UNUSED(Hookdef dummy), Chdata dat)
     mlistp = NULL;

     queue_signals();
+    if (mlbeg == -1) mlbeg = 0;
     if (mselect >= 0 || mlbeg >= 0 ||
 	(mlistp = dupstring(getsparam("LISTPROMPT")))) {
 	unqueue_signals();
@@ -2525,9 +2526,13 @@ domenuselect(Hookdef dummy, Chdata dat)
             modelen = minfo.len;
         }
         first = 0;
-        if (mode == MM_INTER)
+        if (mode == MM_INTER) {
 	    statusline = status;
-        else if (mode) {
+	    if (!validlist) {
+	      broken = 0;
+	      break;
+	    }
+        } else if (mode) {
             int l = sprintf(status, "%s%sisearch%s: ",
                             ((msearchstate & MS_FAILED) ? "failed " : ""),
                             ((msearchstate & MS_WRAPPED) ? "wrapped " : ""),
@@ -3293,6 +3298,9 @@ domenuselect(Hookdef dummy, Chdata dat)
 		broken = 2;
 	    } else
 		acc = 1;
+	    if (mode == MM_INTER) {
+		 minfo.insc = zlemetall;
+	    }
 	    break;
 	}
 	do_single(**p);