diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs
index 866bd4a1d0f695a7cb3c412249c9135d5ba95a95..26b1df4cda7c1d125df2f976bf09f9e6e3db6fef 100644
--- a/crates/gpui2/src/elements/uniform_list.rs
+++ b/crates/gpui2/src/elements/uniform_list.rs
@@ -206,7 +206,9 @@ impl Element for UniformList {
                             let content_height =
                                 item_height * self.item_count + padding.top + padding.bottom;
                             let min_scroll_offset = padded_bounds.size.height - content_height;
-                            if scroll_offset.y < min_scroll_offset {
+                            let is_scrolled = scroll_offset.y != px(0.);
+
+                            if is_scrolled && scroll_offset.y < min_scroll_offset {
                                 shared_scroll_offset.borrow_mut().y = min_scroll_offset;
                                 scroll_offset.y = min_scroll_offset;
                             }