diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 2e925ede48..4bc4f4eb1c 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1065,14 +1065,12 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
     }
     else
     {
-        // Only check colsWidth against clientWidth
-        if ( colsWidth < clientWidth )
+        // Only adapt colsWidth to width
+        if ( colsWidth < m_width )
         {
-            m_colWidths.back() += (clientWidth-colsWidth);
+            m_colWidths.back() += (m_width-colsWidth);
         }
 
-        m_width = colsWidth;
-
         // If width changed, recalculate virtual size
         if ( IsDisplayed() )
             pg->RecalculateVirtualSize();