diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d613e11f680b591aada745c6ce62b0478055249a..578587400a2e13567671a68747c96e6048051108 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -5580,7 +5580,11 @@ impl EditorElement {
                     continue;
                 }
                 let row_ix = display_row_range.start.0.saturating_sub(row_range.start.0);
-                if row_infos[row_ix as usize].diff_status.is_none() {
+                if row_infos
+                    .get(row_ix as usize)
+                    .and_then(|row_info| row_info.diff_status)
+                    .is_none()
+                {
                     continue;
                 }
                 if highlighted_rows