diff --git a/far/changelog b/far/changelog
index 69730cf611..cd6b661841 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2023-12-30 01:44:13+00:00 - build 6241
+
+1. gh-769: "Find All" list is truncated from the top on a short screen.
+
 --------------------------------------------------------------------------------
 MZK 2023-12-29 16:07:42-08:00 - build 6240
 
diff --git a/far/editor.cpp b/far/editor.cpp
index 30931d9f9b..36522ea40e 100644
--- a/far/editor.cpp
+++ b/far/editor.cpp
@@ -3747,8 +3747,8 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
 
 	if(FindAll && MatchFound)
 	{
-		const auto MenuY1 = ScrY - 20;
-		const auto MenuY2 = MenuY1 + std::min(static_cast<int>(FindAllList->size()), 10) + 2;
+		const auto MenuY1 = std::max(0, ScrY - 20);
+		const auto MenuY2 = std::min(ScrY, MenuY1 + std::min(static_cast<int>(FindAllList->size()), 10) + 2);
 		FindAllList->SetMenuFlags(VMENU_WRAPMODE | VMENU_SHOWAMPERSAND);
 		FindAllList->SetPosition({ -1, MenuY1, 0, MenuY2 });
 		FindAllList->SetTitle(far::vformat(msg(lng::MEditSearchStatistics), FindAllList->size(), AllRefLines));
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index b37abc45f9..d5c0ea8455 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6240
+6241