diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9b104021e8..c27b0381d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-05 17:52 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbxbp/xbpdialog.prg
+    ! Fixed a long-standing bug where oDlg:close slot was 
+      hiding the window instead of passing taking appropriate
+      action when user was opting not to close the window
+      returning .F. from this codeblock.
+
 2010-02-05 10:11 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbslots.cpp
     ! Fixed wrong number of parameters push to hb_vmEvalBlockV().
diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg
index 70dba20469..7535566f11 100644
--- a/harbour/contrib/hbxbp/xbpdialog.prg
+++ b/harbour/contrib/hbxbp/xbpdialog.prg
@@ -263,23 +263,19 @@ METHOD XbpDialog:destroy()
 /*----------------------------------------------------------------------*/
 
 METHOD XbpDialog:exeBlock( nEvent, pEvent )
-   LOCAL lRet := .F.
 
    HB_SYMBOL_UNUSED( pEvent )
 
    DO CASE
    CASE nEvent == QEvent_WindowActivate
       SetAppEvent( xbeP_SetDisplayFocus, NIL, NIL, Self )
-      lRet := .T.
 
    CASE nEvent == QEvent_WindowDeactivate
       SetAppEvent( xbeP_KillDisplayFocus, NIL, NIL, Self )
-      lRet := .T.
 
    CASE nEvent == QEvent_Close
       IF hb_isBlock( ::sl_close )
-         lRet := eval( ::sl_close, NIL, NIL, Self )
-         IF lRet
+         IF eval( ::sl_close, NIL, NIL, Self )
             SetAppEvent( xbeP_Close, NIL, NIL, Self )
          ENDIF
       ELSE
@@ -288,7 +284,7 @@ METHOD XbpDialog:exeBlock( nEvent, pEvent )
 
    ENDCASE
 
-   RETURN lRet
+   RETURN .T.
 
 /*----------------------------------------------------------------------*/