diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 4e0180608170527617b6d47f4efc96816377ab74..220e87562556db1911aad832aab4f0aff6ab953f 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -733,6 +733,8 @@ impl DiagnosticPopover {
             .id("diagnostic")
             .block()
             .max_h(max_size.height)
+            .overflow_y_scroll()
+            .max_w(max_size.width)
             .elevation_2_borderless(cx)
             // Don't draw the background color if the theme
             // allows transparent surfaces.