diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f1101ad4..6cf99927 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3352,7 +3352,15 @@ fn surround_add(cx: &mut Context) {
 
             let mut changes = Vec::new();
             for (i, range) in selection.iter().enumerate() {
-                let (from, to) = (range.from(), range.to() + 1);
+                let from = range.from();
+                let line = text.char_to_line(range.to());
+                let max_to = doc.text().len_chars().saturating_sub(
+                    get_line_ending(&text.line(line))
+                        .map(|le| le.len_chars())
+                        .unwrap_or(0),
+                );
+                let to = std::cmp::min(range.to() + 1, max_to);
+
                 changes.push((from, from, Some(Tendril::from_char(open))));
                 changes.push((to, to, Some(Tendril::from_char(close))));
             }
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index cce3d31f..dabb8adf 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -201,16 +201,6 @@ impl Default for Keymaps {
 
 
             key!('m') => Command::surround,
-            // TODO: refactor into
-            // key!('m') => commands::select_to_matching,
-            // key!('M') => commands::back_select_to_matching,
-            // select mode extend equivalents
-
-            // key!('.') => commands::repeat_insert,
-            // repeat_select
-
-            // TODO: figure out what key to use
-            // key!('[') => Command::expand_selection, ??
             key!('[') => Command::left_bracket_mode,
             key!(']') => Command::right_bracket_mode,