diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs
index 9fedbad41c580b767d5c4425be1aa7a5c5f3b9b9..27499b93a69dabd081226fa275892ec71662ae81 100644
--- a/crates/gpui2/src/elements/uniform_list.rs
+++ b/crates/gpui2/src/elements/uniform_list.rs
@@ -191,7 +191,7 @@ impl Element for UniformList {
             content_size,
             &mut element_state.interactive,
             cx,
-            |style, scroll_offset, cx| {
+            |style, mut scroll_offset, cx| {
                 let border = style.border_widths.to_pixels(cx.rem_size());
                 let padding = style.padding.to_pixels(bounds.size.into(), cx.rem_size());
 
@@ -204,6 +204,13 @@ impl Element for UniformList {
                 cx.with_z_index(style.z_index.unwrap_or(0), |cx| {
                     style.paint(bounds, cx, |cx| {
                         if self.item_count > 0 {
+                            let min_scroll_offset =
+                                padded_bounds.size.height - (item_height * self.item_count);
+                            if scroll_offset.y < min_scroll_offset {
+                                shared_scroll_offset.borrow_mut().y = min_scroll_offset;
+                                scroll_offset.y = min_scroll_offset;
+                            }
+
                             if let Some(scroll_handle) = self.scroll_handle.clone() {
                                 scroll_handle.0.borrow_mut().replace(ScrollHandleState {
                                     item_height,