diff --git a/win32ss/user/user32/controls/listbox.c b/win32ss/user/user32/controls/listbox.c
index 072ff67dfb1..8e909f9857e 100644
--- a/win32ss/user/user32/controls/listbox.c
+++ b/win32ss/user/user32/controls/listbox.c
@@ -1965,7 +1965,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos
         case SB_THUMBTRACK:
             info.cbSize = sizeof(info);
             info.fMask  = SIF_TRACKPOS;
+#ifdef __REACTOS__
+            GetScrollInfo( descr->self, SB_HORZ, &info );
+#else
             GetScrollInfo( descr->self, SB_VERT, &info );
+#endif
             LISTBOX_SetTopItem( descr, info.nTrackPos*descr->page_size,
                                 TRUE );
             break;
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c
index 9171d0f693b..9a2272d3c89 100644
--- a/win32ss/user/user32/windows/defwnd.c
+++ b/win32ss/user/user32/windows/defwnd.c
@@ -1042,8 +1042,10 @@ RealDefWindowProcW(HWND hWnd,
                if (!Wnd->pSBInfo)
                {
                   SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0};
-                  SetScrollInfo( hWnd, SB_HORZ, &si, FALSE );
-                  SetScrollInfo( hWnd, SB_VERT, &si, FALSE );
+                  if (Wnd->style & WS_HSCROLL)
+                     SetScrollInfo( hWnd, SB_HORZ, &si, FALSE );
+                  if (Wnd->style & WS_VSCROLL)
+                     SetScrollInfo( hWnd, SB_VERT, &si, FALSE );
                }
             }