diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 73887e2879..c7f0d56cea 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-25 12:48 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/wvgpaint.prg
+    ! Fixed: focus was not set to the window from where a modal 
+      dialog was being initiated. Thanks Zoran Sibinovic for code example.
+
 2011-05-25 12:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/ideedit.prg
     ! Fixed: CTRL+Insert was not copying text to the clipboard.
diff --git a/harbour/contrib/gtwvg/wvgpaint.prg b/harbour/contrib/gtwvg/wvgpaint.prg
index f7d7f4047e..d4b867493f 100644
--- a/harbour/contrib/gtwvg/wvgpaint.prg
+++ b/harbour/contrib/gtwvg/wvgpaint.prg
@@ -449,6 +449,8 @@ Function Wvt_DialogBox( acnDlg, cbDlgProc, hWndParent )
 
    nResult := Wvt_CreateDialogModal( xTemplate, .f., cbDlgProc, nDlgMode, hWndParent )
 
+   Wvg_SetFocus( hWndParent )
+   
    Return nResult
 
 /*----------------------------------------------------------------------*/