diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 217b1e63e4f53dc1ac0766950bf9d31cf03bfa1c..466b6e932390fc7b0ae1e1da286fb455f50be634 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -172,7 +172,7 @@ pub fn next_word_boundary(map: &DisplaySnapshot, mut point: DisplayPoint) -> Dis
         }
         prev_char_kind = Some(char_kind);
     }
-    point
+    map.clip_point(point, Bias::Right)
 }
 
 pub fn is_inside_word(map: &DisplaySnapshot, point: DisplayPoint) -> bool {