diff --git "a/win32ss/user/ntuser/scrollbar.c" "b/win32ss/user/ntuser/scrollbar.c"
index 5e39fe4ad7e..c4dc25ced66 100644
--- "a/win32ss/user/ntuser/scrollbar.c"
+++ "b/win32ss/user/ntuser/scrollbar.c"
@@ -522,6 +522,7 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw)
       if (Info->nPos != lpsi->nPos)
       {
          Info->nPos = lpsi->nPos;
+         Info->nTrackPos = lpsi->nPos;
          pSBData->pos = lpsi->nPos;
       }
    }
@@ -1448,6 +1449,9 @@ NtUserSetScrollBarInfo(
    sbi = IntGetScrollbarInfoFromWindow(Window, Obj);
    psi = IntGetScrollInfoFromWindow(Window, Obj);
 
+   if (!Safeinfo.nTrackPos && psi->nTrackPos)
+       Safeinfo.nTrackPos = psi->nTrackPos;
+
    psi->nTrackPos = Safeinfo.nTrackPos;
    sbi->reserved = Safeinfo.reserved;
    RtlCopyMemory(&sbi->rgstate, &Safeinfo.rgstate, sizeof(Safeinfo.rgstate));