diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c
index b7738e6676c..cf5067c8334 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.71 2004/02/21 23:30:18 navaraf Exp $
+ *  $Id: painting.c,v 1.72 2004/02/22 16:56:14 navaraf Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -560,7 +560,7 @@ IntFindWindowToRepaint(HWND hWnd, PW32THREAD Thread)
    }
 
    ExAcquireFastMutex(&Window->ChildrenListLock);
-   for (Child = Window->LastChild; Child; Child = Child->PrevSibling)
+   for (Child = Window->FirstChild; Child; Child = Child->NextSibling)
    {
       if (IntIsWindowDirty(Child) &&
           IntWndBelongsToThread(Child, Thread))
diff --git a/reactos/subsys/win32k/ntuser/vis.c b/reactos/subsys/win32k/ntuser/vis.c
index c2aa65d3e46..c5e600a2df2 100644
--- a/reactos/subsys/win32k/ntuser/vis.c
+++ b/reactos/subsys/win32k/ntuser/vis.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: vis.c,v 1.18 2004/02/22 12:25:34 navaraf Exp $
+ * $Id: vis.c,v 1.19 2004/02/22 16:56:14 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -82,7 +82,8 @@ VIS_ComputeVisibleRegion(
       NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND);
       NtGdiDeleteObject(ClipRgn);
 
-      if (ClipSiblings)
+      if ((CurrentWindow->Style & WS_CLIPSIBLINGS) ||
+          (PreviousWindow == Window && ClipSiblings))
       {
          ExAcquireFastMutexUnsafe(&CurrentWindow->ChildrenListLock);
          CurrentSibling = CurrentWindow->FirstChild;