diff --git a/src/buffer/mod.rs b/src/buffer/mod.rs
index 5587caed182..94b471aa411 100644
--- a/src/buffer/mod.rs
+++ b/src/buffer/mod.rs
@@ -1990,6 +1990,10 @@ impl TextBuffer {
         let mut y = beg.logical_pos.y;
 
         loop {
+            if offset >= replacement.len() {
+                break;
+            }
+
             let mut remove = 0;
 
             if replacement[offset] == b'\t' {
@@ -2015,9 +2019,6 @@ impl TextBuffer {
             }
 
             (offset, y) = unicode::newlines_forward(&replacement, offset, y, y + 1);
-            if offset >= replacement.len() {
-                break;
-            }
         }
 
         if replacement.len() == initial_len {