diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 39cd568964..a50ddb2768 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-12 13:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbxbp/xbpgeneric.prg
+  * contrib/hbxbp/xbpwindow.prg
+    ! Fixed: where XbpDialog() was calculating positions incorrectly 
+      for whole frame instead of primary monitor.
+
 2011-04-12 12:42 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/gtqtc/gtqtc.cpp
   * contrib/hbqt/gtqtc/gtqtc.h
diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg
index 013b3dda5e..0e8a4d98e2 100644
--- a/harbour/contrib/hbxbp/xbpgeneric.prg
+++ b/harbour/contrib/hbxbp/xbpgeneric.prg
@@ -293,8 +293,7 @@ FUNCTION SetAppFocus( oXbp )
 FUNCTION AppDesktop()
 
    IF s_oDeskTop == NIL
-      s_oDeskTop := XbpWindow():new()
-      s_oDeskTop:oWidget := HbpAppDesktop():new():create()
+      s_oDeskTop := HbpAppDesktop():new():create()
    ENDIF
 
    RETURN s_oDeskTop
diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg
index 719266fc09..a42e7b032b 100644
--- a/harbour/contrib/hbxbp/xbpwindow.prg
+++ b/harbour/contrib/hbxbp/xbpwindow.prg
@@ -1282,7 +1282,13 @@ METHOD XbpWindow:currentPos()
 
 METHOD XbpWindow:currentSize()
 
-   RETURN { ::oWidget:frameGeometry():width(), ::oWidget:frameGeometry():height() }
+   IF ::className() == "HBPAPPDESKTOP"
+      RETURN { ::width(), ::height() }
+   ELSE
+      RETURN { ::oWidget:frameGeometry():width(), ::oWidget:frameGeometry():height() }
+   ENDIF
+
+   RETURN {}
 
 /*----------------------------------------------------------------------*/