Index: reactos/win32ss/user/user32/controls/edit.c
===================================================================
--- reactos/win32ss/user/user32/controls/edit.c	(revision 75016)
+++ reactos/win32ss/user/user32/controls/edit.c	(working copy)
@@ -1694,7 +1694,8 @@
  */
 static void EDIT_UpdateScrollInfo(EDITSTATE *es)
 {
-    if ((es->style & WS_VSCROLL) && !(es->flags & EF_VSCROLL_TRACK))
+    /* if ((es->style & WS_VSCROLL) && !(es->flags & EF_VSCROLL_TRACK)) */
+    if (es->style & WS_VSCROLL)
     {
 	SCROLLINFO si;
 	si.cbSize	= sizeof(SCROLLINFO);
@@ -1708,7 +1709,8 @@
 	SetScrollInfo(es->hwndSelf, SB_VERT, &si, TRUE);
     }
 
-    if ((es->style & WS_HSCROLL) && !(es->flags & EF_HSCROLL_TRACK))
+    /* if ((es->style & WS_HSCROLL) && !(es->flags & EF_HSCROLL_TRACK)) */
+    if (es->style & WS_HSCROLL)
     {
 	SCROLLINFO si;
 	si.cbSize	= sizeof(SCROLLINFO);
Index: reactos/win32ss/user/user32/controls/scrollbar.c
===================================================================
--- reactos/win32ss/user/user32/controls/scrollbar.c	(revision 75016)
+++ reactos/win32ss/user/user32/controls/scrollbar.c	(working copy)
@@ -853,6 +853,7 @@
         if (Wnd == GetFocus()) ShowCaret(Wnd);
         ScrollBarInfo.rgstate[ScrollTrackHitTest] &= ~STATE_SYSTEM_PRESSED;
         NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest];
+        NewInfo.nTrackPos = GetScrollPos(Wnd, SBType);
         NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo);
 
         IntDrawScrollInterior(Wnd,Dc,SBType,Vertical,&ScrollBarInfo);