diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c
index ab789b72ae2..bc8331b464b 100644
--- a/reactos/subsys/win32k/ntuser/painting.c
+++ b/reactos/subsys/win32k/ntuser/painting.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: painting.c,v 1.16 2003/05/27 07:23:05 gvg Exp $
+/* $Id: painting.c,v 1.17 2003/05/31 08:51:58 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -414,6 +414,7 @@ PaintUpdateRgns(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags,
 		      Total.y += Offset.y;
 		    }
 		}
+	      ChildListEntry = ChildListEntry->Flink;
 	    }
 	  W32kOffsetRgn(hRgn, Total.x, Total.y);
 	  HasChildren = FALSE;
@@ -434,6 +435,7 @@ PaintUpdateRgns(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags,
 	    {
 	      PaintUpdateRgns(Child, hRgn, Flags, FALSE);
 	    }
+	  ChildListEntry = ChildListEntry->Flink;
 	}
     }
 
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 4b37e126eec..27326845c54 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.50 2003/05/26 10:52:15 rcampbell Exp $
+/* $Id: window.c,v 1.51 2003/05/31 08:51:58 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -671,6 +671,17 @@ NtUserCreateWindowEx(DWORD dwExStyle,
       W32kCallWindowProc(NULL, WindowObject->Self, WM_MOVE, 0, lParam);
     }
 
+  /* Move from parent-client to screen coordinates */
+  if (0 != (WindowObject->Style & WS_CHILD))
+    {
+    W32kOffsetRect(&WindowObject->WindowRect,
+		   ParentWindow->ClientRect.left,
+		   ParentWindow->ClientRect.top);
+    W32kOffsetRect(&WindowObject->ClientRect,
+		   ParentWindow->ClientRect.left,
+		   ParentWindow->ClientRect.top);
+    }
+
   /* Show or maybe minimize or maximize the window. */
   if (WindowObject->Style & (WS_MINIMIZE | WS_MAXIMIZE))
     {