diff --git a/wezterm-gui/src/termwindow/render/screen_line.rs b/wezterm-gui/src/termwindow/render/screen_line.rs
index 65ad8b3d2bd3..3f5a47997b12 100644
--- a/wezterm-gui/src/termwindow/render/screen_line.rs
+++ b/wezterm-gui/src/termwindow/render/screen_line.rs
@@ -90,27 +90,32 @@ impl crate::TermWindow {
                 composing_text_width = unicode_column_width(text, None);
 
                 if let Some(attr) = attr {
-                    // convert text and attr to selections
+                    // convert SELECTED attr to selections
                     let mut selection = 0usize..0;
                     // iterate over byte end of each character in text
-                    for (i, end) in text
+                    for (j, end) in text
                         .char_indices()
                         .map(|(offset, _)| offset)
                         .chain([text.len()])
+                        .enumerate()
                         .skip(1)
                         .take(attr.len())
-                        .enumerate()
                     {
-                        // update end to unicode width
-                        let end = unicode_column_width(&text[..end], None);
-                        if attr[i].contains(ComposingAttribute::SELECTED) {
-                            selection.end = end;
-                        }
-                        // add non-empty selection and prepare next selection
-                        if i + 1 == attr.len() || !attr[i].contains(ComposingAttribute::SELECTED) {
-                            if !selection.is_empty() {
-                                composing_selections.push(selection);
+                        let i = j - 1;
+                        // check last character or SELECTED switch
+                        if j == attr.len()
+                            || (attr[i] ^ attr[j]).contains(ComposingAttribute::SELECTED)
+                        {
+                            // update end to unicode width
+                            let end = unicode_column_width(&text[..end], None);
+                            // add selection to selections if attr[i] is end of SELECTED
+                            if attr[i].contains(ComposingAttribute::SELECTED) {
+                                selection.end = end;
+                                if !selection.is_empty() {
+                                    composing_selections.push(selection);
+                                }
                             }
+                            // prepare selection for next SELECTED or start of SELECTED
                             selection = end..end;
                         }
                     }