diff --git a/src/search.c b/src/search.c
index 76ebe4a0d99d4064ad38d41d9aab41e6c809b630..0fbdedf05eb0bf63ec4c667c4d7dc8ad2a75e977 100644
--- a/src/search.c
+++ b/src/search.c
@@ -623,7 +623,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 	if (old_mark_set) {
 	    /* When we've found an occurrence outside of the marked region,
 	     * stop the fanfare. */
-	    if (openfile->current->lineno > bot->lineno ||
+	    if (came_full_circle || openfile->current->lineno > bot->lineno ||
 			openfile->current->lineno < top->lineno ||
 			(openfile->current == bot && openfile->current_x + match_len > bot_x) ||
 			(openfile->current == top && openfile->current_x < top_x))