diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index 26bb5444d..8858b228e 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -409,6 +409,7 @@ int CodeEditor::BlockReplace(WString find, WString replace, bool wholeword, bool
 		Remove(foundpos, foundsize);
 		WString rt = GetReplaceText(replace, wildcards, ignorecase && samecase);
 		Insert(foundpos, rt);
+		foundpos += rt.GetCount();
 		h = h - foundsize + rt.GetCount();
 		count++;
 	}