diff --git a/internal/buffer/search.go b/internal/buffer/search.go
index ffe1e196..5be3128b 100644
--- a/internal/buffer/search.go
+++ b/internal/buffer/search.go
@@ -91,9 +91,10 @@ func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 			l = util.SliceStart(l, end.X)
 		}
 
-		match := r.FindIndex(l)
+		all_matches := r.FindAllIndex(l, -1)
 
-		if match != nil {
+		if all_matches != nil {
+			match := all_matches[len(all_matches)-1]
 			start := Loc{charpos + util.RunePos(l, match[0]), i}
 			end := Loc{charpos + util.RunePos(l, match[1]), i}
 			return [2]Loc{start, end}, true