diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d6cc591f95..97bd920d5c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-11 13:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbxbp/xbpdialog.prg
+  * contrib/hbxbp/xbpparthandler.prg
+    ! Fixed: window geometry while converting to/from as MDI client.
+
 2011-04-11 09:41 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idemain.prg
     ! Fixed: to restore the last run state of hbIDE.
@@ -34,7 +39,7 @@
   * contrib/hbxbp/xbpparthandler.prg
     + Implemented: Xbase++ compatible MDI engine.
       Now Xbase++ code can be compiled and run with this feature, Shum ?
-      TODO: fix some small artifacts when XbpDialog() is made a MDI client.
+      DONE: fix some small artifacts when XbpDialog() is made a MDI client.
             Resuming it back to desktop it is ok.
 
 2011-04-10 12:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -190,6 +195,10 @@
     ! Fixed: window hiding/terminating behavior on QEvent_Close
       as per recent fix in hbQT.
 
+2011-04-07 16:21 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
+    ! Fixed: a last minute change in previous commit.
+
 2011-04-07 16:21 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtcore/hbqt.h
     ! Missed from prev commit.
diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg
index bb7acce528..d541c3d0b7 100644
--- a/harbour/contrib/hbxbp/xbpdialog.prg
+++ b/harbour/contrib/hbxbp/xbpdialog.prg
@@ -200,11 +200,11 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
       ::oWidget:setWindowIcon( ::icon )
    ENDIF
 
+   ::setPosAndSize()
+
    ::nFlags := nFlags
    IF __objGetClsName( ::oParent ) == "XBPDRAWINGAREA"
       ::setParent( ::oParent )
-   ELSE
-      ::setPosAndSize()
    ENDIF
 
    //::setQtProperty()
diff --git a/harbour/contrib/hbxbp/xbpparthandler.prg b/harbour/contrib/hbxbp/xbpparthandler.prg
index 9262e62b6c..5a55623180 100644
--- a/harbour/contrib/hbxbp/xbpparthandler.prg
+++ b/harbour/contrib/hbxbp/xbpparthandler.prg
@@ -252,17 +252,20 @@ METHOD setOwner( oXbp ) CLASS XbpPartHandler
 /*----------------------------------------------------------------------*/
 
 METHOD setParent( oParent ) CLASS XbpPartHandler
+   LOCAL oRect
    LOCAL oOldXbp := ::oParent
 
    IF valtype( oParent ) == "O"
       IF __objHasMsg( Self, "OMDI" )
          IF ! empty( ::oMdi )
-            ::oParent:oWidget:removeSubWindow( ::oWidget ) //::oMdi )
+            ::oParent:oWidget:removeSubWindow( ::oWidget )
             ::oWidget:setWindowFlags( ::nFlags )
             ::oMdi:close()
             ::oMdi := NIL
          ELSEIF __objGetClsName( oParent ) == "XBPDRAWINGAREA"
+            oRect := ::oWidget:frameGeometry()
             ::oMdi := oParent:oWidget:addSubWindow( ::oWidget )
+            ::oMdi:resize( oRect:width(), oRect:height() )
          ENDIF
          ::oWidget:show()
       ENDIF