diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 6b29a4083d..a03d1245f9 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -1987,8 +1987,10 @@ begin
     // optimization for the last nodes
     Result:=GetLastSubNode;
     i:=Count-1;
-    while (Index<i) do
+    while (Index<i) do begin
       Result:=Result.GetPrev;
+      dec(i);
+    end;
   end
   else begin
     Result := GetFirstNode;