diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 579f84e05c..7c7b54b11a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-01-10 18:05 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * source/rtl/teditor.prg
+    ! Fixed [ <nWndRow> scrolls past ::naTextLen ]
+
 2007-01-10 17:50 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   * source/rtl/memoedit.prg
   * source/rtl/teditor.prg
diff --git a/harbour/source/rtl/teditor.prg b/harbour/source/rtl/teditor.prg
index 973d751a5c..fa33f8bd77 100644
--- a/harbour/source/rtl/teditor.prg
+++ b/harbour/source/rtl/teditor.prg
@@ -1033,6 +1033,10 @@ METHOD New( cString, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, nTabS
       ::nFirstCol := ::LineLen( ::nRow ) + 1
    ENDIF
    
+   if ( ::nFirstRow + nWndRow ) > ::naTextLen
+      do while ( ::nFirstRow + ( --nWndRow ) ) > ::naTextLen
+      enddo
+   endif
 
    // Empty area of screen which will hold editor window
    Scroll( nTop, nLeft, nBottom, nRight )