diff --git a/ChangeLog.txt b/ChangeLog.txt
index d629aa0cad..3a1b753e48 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. */
 
+2018-02-23 15:15 UTC+0200 Alexey Myronenko (m.oleksa/at/ukr.net)
+  * src/debug/dbgwa.prg
+    ! fixed position of the cursor in (reopened) F6-WA window
+
 2018-02-13 13:23 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * contrib/sddodbc/core.c
     ! fix DBCreate() GPF when RDDSQL is active and connection is via SDDODBC
diff --git a/src/debug/dbgwa.prg b/src/debug/dbgwa.prg
index 507f33e9cb..f6407a25b7 100644
--- a/src/debug/dbgwa.prg
+++ b/src/debug/dbgwa.prg
@@ -160,6 +160,8 @@ PROCEDURE __dbgShowWorkAreas()
 
 STATIC PROCEDURE DlgWorkAreaPaint( oDlg, aBrw )
 
+   LOCAL oDebug := __dbg()
+
    /* Display captions */
 
    hb_DispOutAt( oDlg:nTop, oDlg:nLeft + 5, " Area ", oDlg:cColor )
@@ -193,8 +195,7 @@ STATIC PROCEDURE DlgWorkAreaPaint( oDlg, aBrw )
    aBrw[ 1 ]:ForceStable()
    aBrw[ 2 ]:ForceStable()
    aBrw[ 3 ]:ForceStable()
-   aBrw[ 2 ]:Dehilite()
-   aBrw[ 3 ]:Dehilite()
+   AEval( aBrw, {| a, i | iif( oDebug:nWaFocus == i, a:HiLite(), a:DeHilite() ) } )
 
    UpdateInfo( oDlg, Alias() )