diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1c8fea9894..948e4585dd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-12 00:37 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbxbp/xbpgeneric.prg
+    ! Fix( try ) to calculate desktop width for primary monitor.
+
+  * contrib/hbxbp/xbpparthandler.prg
+    ! Fixed: RTE while moving a window with owned windows.
+
+  * contrib/hbxbp/xbpwindow.prg
+    ! Fix( try ) to have width exactly that of Xbase++ size.
+
 2011-04-11 22:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   + contrib/hbqt/gtqtc.hbc
   + contrib/hbqt/gtqtc/gtqtc.hbc
diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg
index 0e8a4d98e2..013b3dda5e 100644
--- a/harbour/contrib/hbxbp/xbpgeneric.prg
+++ b/harbour/contrib/hbxbp/xbpgeneric.prg
@@ -293,7 +293,8 @@ FUNCTION SetAppFocus( oXbp )
 FUNCTION AppDesktop()
 
    IF s_oDeskTop == NIL
-      s_oDeskTop := HbpAppDesktop():new():create()
+      s_oDeskTop := XbpWindow():new()
+      s_oDeskTop:oWidget := HbpAppDesktop():new():create()
    ENDIF
 
    RETURN s_oDeskTop
diff --git a/harbour/contrib/hbxbp/xbpparthandler.prg b/harbour/contrib/hbxbp/xbpparthandler.prg
index 9c772475c1..f688f96592 100644
--- a/harbour/contrib/hbxbp/xbpparthandler.prg
+++ b/harbour/contrib/hbxbp/xbpparthandler.prg
@@ -317,7 +317,7 @@ METHOD moveOwned( nOffSetX, nOffSetY ) CLASS XbpPartHandler
    LOCAL oXbp, oPos
 
    FOR EACH oXbp IN ::aOwned
-      IF oXbp:moveWithOwner
+      IF oXbp:className() == "XBPDIALOG" .AND. oXbp:moveWithOwner
          oPos := oXbp:oWidget:pos()
          oXbp:oWidget:move( oPos:x() + nOffSetX, oPos:y() + nOffSetY )
       ENDIF
diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg
index 4f564822a2..719266fc09 100644
--- a/harbour/contrib/hbxbp/xbpwindow.prg
+++ b/harbour/contrib/hbxbp/xbpwindow.prg
@@ -1160,6 +1160,7 @@ METHOD XbpWindow:setPos( aPos, lPaint )
 /*----------------------------------------------------------------------*/
 
 METHOD XbpWindow:setPosAndSize( aPos, aSize, lPaint )
+   LOCAL oSize, oSizeF
 
    IF empty( ::qtObject )
       DEFAULT aPos  TO ::aPos
@@ -1168,8 +1169,11 @@ METHOD XbpWindow:setPosAndSize( aPos, aSize, lPaint )
       IF hb_isArray( aPos ) .and. hb_isArray( aSize )
          DEFAULT lPaint TO .T.
 
-         ::oWidget:resize( aSize[ 1 ], aSize[ 2 ] )
+         oSize  := ::oWidget:size()
+         oSizeF := ::oWidget:frameSize()
+
          ::oWidget:move( aPos[ 1 ], aPos[ 2 ] )
+         ::oWidget:resize( aSize[ 1 ] - ( oSizeF:width()-oSize:width() ), aSize[ 2 ] )
       ENDIF
    ENDIF