diff --git a/ChangeLog.txt b/ChangeLog.txt
index d23e5e410f..f0384adaa0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,10 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-08 13:14 UTC+0100 Kamil Przybylski (kprzybylski quay.pl)
+  * src/rtl/listbox.prg
+    ! fixed nTop variable not being assigned properly in ListBox:hitTest()
+
 2025-01-07 22:49 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * contrib/hbcurl/hbcurl.ch
     * updated HB_CURLOPT_SSL_OPTIONS: HB_CURLSSLOPT_*
diff --git a/src/rtl/listbox.prg b/src/rtl/listbox.prg
index 07ea7792fc..c56533ce66 100644
--- a/src/rtl/listbox.prg
+++ b/src/rtl/listbox.prg
@@ -397,7 +397,7 @@ METHOD getText( nPos ) CLASS ListBox
 METHOD hitTest( nMRow, nMCol ) CLASS ListBox
 
    LOCAL nRet
-   LOCAL nTop
+   LOCAL nTop := ::nTop
    LOCAL nHit := 0
 
    /* Check hit on the scrollbar */
@@ -411,7 +411,6 @@ METHOD hitTest( nMRow, nMCol ) CLASS ListBox
    IF ! ::lIsOpen .OR. Empty( ::cHotBox + ::cColdBox )
       nRet := 0
    ELSE
-      nTop := ::nTop
       IF ::lDropDown
          nTop++
       ENDIF