diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 2125b4d388..5ca8bd62d6 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -380,7 +380,7 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
-        m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
+        m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine;
         m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
         m_hAdjust->page_size = m_hAdjust->page_increment;
 
@@ -408,7 +408,7 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
-        m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
+        m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine;
         m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
         m_vAdjust->page_size = m_vAdjust->page_increment;
 
diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 2125b4d388..5ca8bd62d6 100644
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -380,7 +380,7 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
-        m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
+        m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine;
         m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine);
         m_hAdjust->page_size = m_hAdjust->page_increment;
 
@@ -408,7 +408,7 @@ void wxScrolledWindow::AdjustScrollbars()
     }
     else
     {
-        m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
+        m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine;
         m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine);
         m_vAdjust->page_size = m_vAdjust->page_increment;