diff --git a/far/changelog b/far/changelog
index 276cd41764..7c2b381fd9 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2024-11-04 18:56:51+00:00 - build 6389
+
+1. Fix replacing empty strings in Editor.
+
 --------------------------------------------------------------------------------
 drkns 2024-10-31 20:22:20+00:00 - build 6388
 
diff --git a/far/editor.cpp b/far/editor.cpp
index ca4f358af3..891052851a 100644
--- a/far/editor.cpp
+++ b/far/editor.cpp
@@ -3563,6 +3563,9 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
 					}
 					else
 					{
+						if (!SearchLength && strReplaceStrCurrent.empty())
+							ZeroLength = true;
+
 						auto MsgCode = message_result::first_button;
 
 						if (!IsReplaceAll)
@@ -3575,9 +3578,6 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
 							newcol.Priority=EDITOR_COLOR_SELECTION_PRIORITY;
 							AddColor(CurPtr, newcol);
 
-							if (!SearchLength && strReplaceStrCurrent.empty())
-								ZeroLength = true;
-
 							Progress.reset();
 
 							MsgCode = Message(0,
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 7f130505bc..bd919dc8d5 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6388
+6389