diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
index 61d59f9d57ac6892c149037e7c1b4720627dd93b..d1ed532a00bf6cda9a151ce3684016d4a022fd07 100644
--- a/crates/editor/src/bracket_colorization.rs
+++ b/crates/editor/src/bracket_colorization.rs
@@ -24,20 +24,11 @@ impl Editor {
 
         let accents_count = cx.theme().accents().0.len();
         let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        let all_excerpts = self.buffer().read(cx).excerpt_ids();
         let anchors_in_multi_buffer = |current_excerpt: ExcerptId,
                                        text_anchors: [text::Anchor; 4]|
          -> Option<[Option<_>; 4]> {
             multi_buffer_snapshot
-                .anchors_in_excerpt(current_excerpt, text_anchors)
-                .or_else(|| {
-                    all_excerpts
-                        .iter()
-                        .filter(|&&excerpt_id| excerpt_id != current_excerpt)
-                        .find_map(|&excerpt_id| {
-                            multi_buffer_snapshot.anchors_in_excerpt(excerpt_id, text_anchors)
-                        })
-                })?
+                .anchors_in_excerpt(current_excerpt, text_anchors)?
                 .collect_array()
         };
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index cf7e6b0e1b5ffff54f2351ad53d0eda62471c660..a223949c59dd58cc11aab9e90caf95b985c79d8e 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -17403,12 +17403,12 @@ impl Editor {
         };
 
         let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut excerpt_ids = selections
+        let excerpt_ids = selections
             .iter()
             .flat_map(|selection| snapshot.excerpt_ids_for_range(selection.range()))
+            .unique()
+            .sorted()
             .collect::<Vec<_>>();
-        excerpt_ids.sort();
-        excerpt_ids.dedup();
 
         if self.delegate_expand_excerpts {
             cx.emit(EditorEvent::ExpandExcerptsRequested {
diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
index 3922132cc83f387eec9543fe8b80b7c330c25678..84c72bb725fd3f403c6819acfaeaa8aa77fcaafd 100644
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ b/crates/editor/src/inlays/inlay_hints.rs
@@ -8,6 +8,7 @@ use clock::Global;
 use collections::{HashMap, HashSet};
 use futures::future::join_all;
 use gpui::{App, Entity, Task};
+use itertools::Itertools;
 use language::{
     BufferRow,
     language_settings::{InlayHintKind, InlayHintSettings, language_settings},
@@ -772,8 +773,17 @@ impl Editor {
             return;
         };
 
-        let mut hints_to_remove = Vec::new();
         let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
+        let Some(buffer_snapshot) = self
+            .buffer
+            .read(cx)
+            .buffer(buffer_id)
+            .map(|buffer| buffer.read(cx).snapshot())
+        else {
+            return;
+        };
+
+        let mut hints_to_remove = Vec::new();
 
         // If we've received hints from the cache, it means `invalidate_cache` had invalidated whatever possible there,
         // and most probably there are no more hints with IDs from `visible_inlay_hint_ids` in the cache.
@@ -786,9 +796,8 @@ impl Editor {
             hints_to_remove.extend(visible_inlay_hint_ids);
         }
 
-        let excerpts = self.buffer.read(cx).excerpt_ids();
         let mut inserted_hint_text = HashMap::default();
-        let hints_to_insert = new_hints
+        let new_hints = new_hints
             .into_iter()
             .filter_map(|(chunk_range, hints_result)| {
                 let chunks_fetched = inlay_hints.hint_chunk_fetching.get_mut(&buffer_id);
@@ -843,22 +852,24 @@ impl Editor {
 
                 hints_deduplicated
             })
-            .filter_map(|(hint_id, lsp_hint)| {
-                if inlay_hints.allowed_hint_kinds.contains(&lsp_hint.kind)
+            .filter(|(hint_id, lsp_hint)| {
+                inlay_hints.allowed_hint_kinds.contains(&lsp_hint.kind)
                     && inlay_hints
                         .added_hints
-                        .insert(hint_id, lsp_hint.kind)
+                        .insert(*hint_id, lsp_hint.kind)
                         .is_none()
-                {
-                    let position = excerpts.iter().find_map(|excerpt_id| {
-                        multi_buffer_snapshot.anchor_in_excerpt(*excerpt_id, lsp_hint.position)
-                    })?;
-                    return Some(Inlay::hint(hint_id, position, &lsp_hint));
-                }
-                None
             })
+            .sorted_by(|(_, a), (_, b)| a.position.cmp(&b.position, &buffer_snapshot))
             .collect::<Vec<_>>();
 
+        let hints_to_insert = multi_buffer_snapshot
+            .text_anchors_to_visible_anchors(
+                new_hints.iter().map(|(_, lsp_hint)| lsp_hint.position),
+            )
+            .into_iter()
+            .zip(&new_hints)
+            .filter_map(|(position, (hint_id, hint))| Some(Inlay::hint(*hint_id, position?, &hint)))
+            .collect();
         let invalidate_hints_for_buffers =
             std::mem::take(&mut inlay_hints.invalidate_hints_for_buffers);
         if !invalidate_hints_for_buffers.is_empty() {
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index 42c918d1957a3fd358f0bec748c38e7e372f3397..927f7b870852b94be6efa075d6956d980da34f08 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -2254,7 +2254,7 @@ mod tests {
         assert_eq!(lhs_content, expected_lhs, "lhs");
     }
 
-    #[gpui::test(iterations = 100)]
+    #[gpui::test(iterations = 25)]
     async fn test_random_split_editor(mut rng: StdRng, cx: &mut gpui::TestAppContext) {
         use rand::prelude::*;