diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 972350ce5d..006a42700b 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -615,7 +615,7 @@ impl HoverState {
         !self.info_popovers.is_empty() || self.diagnostic_popover.is_some()
     }
 
-    pub fn render(
+    pub(crate) fn render(
         &mut self,
         snapshot: &EditorSnapshot,
         visible_rows: Range<DisplayRow>,
@@ -694,7 +694,11 @@ pub(crate) struct InfoPopover {
 }
 
 impl InfoPopover {
-    pub fn render(&mut self, max_size: Size<Pixels>, cx: &mut ViewContext<Editor>) -> AnyElement {
+    pub(crate) fn render(
+        &mut self,
+        max_size: Size<Pixels>,
+        cx: &mut ViewContext<Editor>,
+    ) -> AnyElement {
         let keyboard_grace = Rc::clone(&self.keyboard_grace);
         let mut d = div()
             .id("info_popover")
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
index b11e9118c1..eceddb02dd 100644
--- a/crates/ui/src/components/scrollbar.rs
+++ b/crates/ui/src/components/scrollbar.rs
@@ -37,13 +37,14 @@ impl ScrollableHandle {
             }),
             ScrollableHandle::NonUniform(handle) => {
                 let last_children_index = handle.children_count().checked_sub(1)?;
-                // todo: PO: this is slightly wrong for horizontal scrollbar, as the last item is not necessarily the longest one.
+
                 let mut last_item = handle.bounds_for_item(last_children_index)?;
-                last_item.size.height += last_item.origin.y;
-                last_item.size.width += last_item.origin.x;
                 let mut scroll_adjustment = None;
                 if last_children_index != 0 {
+                    // todo: PO: this is slightly wrong for horizontal scrollbar, as the last item is not necessarily the longest one.
                     let first_item = handle.bounds_for_item(0)?;
+                    last_item.size.height += last_item.origin.y;
+                    last_item.size.width += last_item.origin.x;
 
                     scroll_adjustment = Some(first_item.origin);
                     last_item.size.height -= first_item.origin.y;
@@ -140,6 +141,7 @@ impl ScrollbarState {
         }) {
             current_offset -= adjustment;
         }
+
         let mut percentage = current_offset / main_dimension_size;
         let viewport_size = self.scroll_handle.viewport().size;
         let end_offset = (current_offset + viewport_size.along(axis).0) / main_dimension_size;