diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 49917d7adea8cc67d2e82f130d02c5295bdaaae1..b886c5db1f970e2e2c0da07c67a127426993773e 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3501,10 +3501,11 @@ impl Element for EditorElement {
                 let content_origin =
                     text_hitbox.origin + point(gutter_dimensions.margin, Pixels::ZERO);
 
-                let mut autoscroll_requested = false;
+                let mut autoscroll_containing_element = false;
                 let mut autoscroll_horizontally = false;
                 self.editor.update(cx, |editor, cx| {
-                    autoscroll_requested = editor.autoscroll_requested();
+                    autoscroll_containing_element =
+                        editor.autoscroll_requested() || editor.has_pending_selection();
                     autoscroll_horizontally = editor.autoscroll_vertically(bounds, line_height, cx);
                     snapshot = editor.snapshot(cx);
                 });
@@ -3683,7 +3684,7 @@ impl Element for EditorElement {
                     scroll_pixel_position,
                     line_height,
                     em_width,
-                    autoscroll_requested,
+                    autoscroll_containing_element,
                     cx,
                 );