diff --git a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
index 20ee9253d379..0a715d27a43e 100644
--- a/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
+++ b/crates/ide-assists/src/handlers/generate_getter_or_setter.rs
@@ -358,7 +358,8 @@ fn extract_and_parse_record_fields(
             let info_of_record_fields_in_selection = ele
                 .fields()
                 .filter_map(|record_field| {
-                    if selection_range.contains_range(record_field.syntax().text_range()) {
+                    let field_range = record_field.syntax().text_range();
+                    if selection_range.intersect(field_range).is_some_and(|rng| !rng.is_empty()) {
                         let record_field_info = parse_record_field(record_field, assist_type)?;
                         field_names.push(record_field_info.fn_name.clone());
                         return Some(record_field_info);
@@ -894,6 +895,37 @@ struct Context {
     count: usize,
 }
 
+impl Context {
+    fn data(&self) -> &Data {
+        &self.data
+    }
+
+    fn $0count(&self) -> &usize {
+        &self.count
+    }
+}
+    "#,
+        );
+    }
+
+    #[test]
+    fn test_generate_multiple_getters_from_partial_selection() {
+        check_assist(
+            generate_getter,
+            r#"
+struct Context {
+    data$0: Data,
+    count$0: usize,
+    other: usize,
+}
+    "#,
+            r#"
+struct Context {
+    data: Data,
+    count: usize,
+    other: usize,
+}
+
 impl Context {
     fn data(&self) -> &Data {
         &self.data