diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index f65fb4b487..8c40ecb853 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -353,9 +353,15 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     if (do_refresh && !noRefresh)
         m_targetWindow->Refresh(TRUE, GetRect());
 
+    // TODO: check if we can use AdjustScrollbars always.
+#ifdef __WXUNIVERSAL__
+    AdjustScrollbars();
+#else    
+    // This is also done by AdjustScrollbars, above
 #ifdef __WXMAC__
     m_targetWindow->MacUpdateImmediately() ;
 #endif
+#endif
 }
 
 // ----------------------------------------------------------------------------