diff --git a/src/search.c b/src/search.c
index 33ced4c9..5790c265 100644
--- a/src/search.c
+++ b/src/search.c
@@ -579,6 +579,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 			light_from_col = xplustabs();
 			light_to_col = strnlenpt(openfile->current->data,
 										openfile->current_x + match_len);
+			currmenu = MMAIN;
 
 			/* Refresh the edit window, scrolling it if necessary. */
 			edit_refresh();
diff --git a/src/text.c b/src/text.c
index 5ffdb072..acf0b864 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2202,6 +2202,7 @@ bool fix_spello(const char *word)
 		filestruct *saved_mark = openfile->mark;
 		openfile->mark = NULL;
 #endif
+		currmenu = MMAIN;
 		edit_refresh();
 
 		/* Let the user supply a correctly spelled alternative. */