diff --git a/ChangeLog.txt b/ChangeLog.txt
index 35b3a42924..35bb5a7848 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-05-20 19:49 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/debug/dbgbrwsr.prg
+    ! update current row position after resizing
+      It should fix 2-nd problem reported by Rolf.
+
 2014-05-20 17:03 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/debug/debugger.prg
     ! calculate ListBox coordinates as integer value
diff --git a/src/debug/dbgbrwsr.prg b/src/debug/dbgbrwsr.prg
index d7be3e3600..9f1bc4fabf 100644
--- a/src/debug/dbgbrwsr.prg
+++ b/src/debug/dbgbrwsr.prg
@@ -125,6 +125,10 @@ METHOD New( nTop, nLeft, nBottom, nRight, oParentWindow ) CLASS HBDbBrowser
 METHOD Configure()
 
    ::rowCount := ::nBottom - ::nTop + 1
+   IF ::rowPos > ::rowCount
+      ::nFirstVisible -= ::rowPos - ::rowCount
+      ::rowPos := ::rowCount
+   ENDIF
    AFill( ASize( ::aRowState, ::rowCount ), .F. )
    ::lConfigured := .T.