diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 65966fa89b..77d47c63e8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-05 08:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbxbp/xbpdialog.prg
+    ! Fixed: a RTE on some ocassions. Thanks Shum for reporting.
+
 2011-05-05 16:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/harbour.hbx
   * src/rtl/libnamec.c
diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg
index ee8c217a45..ae7dd1d760 100644
--- a/harbour/contrib/hbxbp/xbpdialog.prg
+++ b/harbour/contrib/hbxbp/xbpdialog.prg
@@ -156,7 +156,7 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
       IF ::taskList
          ::oWidget := QMainWindow()
       ELSE
-         ::oWidget := QMainWindow( SetAppWindow() )
+         ::oWidget := QMainWindow( SetAppWindow():oWidget )
       ENDIF
       ::oWidget:setMouseTracking( .t. )
       ::oWidget:setObjectName( "mainWindow" )