diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 441d57618a..7d8c193d11 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -614,7 +614,7 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
             minSize = m_minimumPaneSize;
 
         int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
-        if ( maxSize > 0 && sashPos > maxSize )
+        if ( maxSize > 0 && sashPos > maxSize && maxSize >= m_minimumPaneSize)
             sashPos = maxSize;
     }