diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3567efe88..acc3f52e96 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-11 22:57 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>
+  * source/debug/tbrwtext.prg
+    ! Bug fixed in Search() method.
+
 2009-06-11 17:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     - Deleted link to clc newgroup.
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index 0137786a87..d8fa2df691 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -261,6 +261,7 @@ METHOD Search( cString, lCaseSensitive, nMode ) CLASS HBBrwText
 
    LOCAL bMove
    LOCAL lFound := .F.
+   LOCAL n
 
    IF !lCaseSensitive
       cString := Upper( cString )
@@ -276,9 +277,12 @@ METHOD Search( cString, lCaseSensitive, nMode ) CLASS HBBrwText
       bMove := {|| ::Skip( -1 ) }
    ENDCASE
 
+   n := ::nRow
+
    DO WHILE Eval( bMove ) != 0
-      IF cString $ IIF( lCaseSensitive, ::cCurLine, Upper( ::cCurLine ) )
+      IF cString $ IIF( lCaseSensitive, ::aRows[ ::nRow ], Upper( ::aRows[ ::nRow ] ) )
          lFound := .T.
+         ::oBrw:MoveCursor( ::nRow - n )
          ::RefreshAll()
          EXIT
       ENDIF