diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 11bd3d998e..c8a97b6f36 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-25 18:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/achoice.prg
+    ! ACHOICE(): Fixed two navigation bugs (misplacement and RTE)
+      reported by Abe Buchinger.
+      Many thanks to Jerry Finuliar for the patches.
+
 2010-06-25 12:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/minizip/minizip.dif
     ! Deleted svn:keywords property.
@@ -37,7 +43,7 @@
   * contrib/gtwvg/wvgsink.c
   * contrib/gtwvg/wvgwing.c
     % Using hb_par*def().
-    * WVT_CHOOSEFONT() fixed. Parameters italic, underline, strikeout
+    ! WVT_CHOOSEFONT() fixed. Parameters italic, underline, strikeout
       didn't work.
 
 2010-06-25 09:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
@@ -343,7 +349,7 @@
     ! Fixed to use platform EOL in generated files.
     % Don't return an array from MAIN() function
     ; These changes allow to create automated processes to
-      generate .hbp from .ui.
+      generate .uip from .ui.
 
   + contrib/hbqt/utils/hbmk.hbm
     + Added hbmk2 make file for hbqt utils.
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index ed44aa7fb5..0576ee897e 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -340,7 +340,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
       CASE nKey == K_CTRL_END
 
          IF nPos == nLastItem
-            IF nAtTop == Min( nPos, nItems - nNumRows + 1 )
+            IF nAtTop == Min( nPos, nItems - nNumRows + 1 ) .OR. nPos == nItems
                nMode := AC_HITBOTTOM
             ELSE
                nAtTop := Min( nPos, nItems - nNumRows + 1 )
@@ -383,6 +383,10 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
                      nAtTop--
                   ENDDO
                   nAtTop := Max( 1, nAtTop )
+                  IF nAtTop < nNumRows .AND. nPos < nNumRows
+                     nPos := nNumRows
+                     nAtTop := 1
+                  ENDIF
                ENDIF
             ENDIF
             DispPage( acItems, alSelect, nTop, nLeft, nRight, nNumRows, nPos, nAtTop, nItems )