diff --git a/docs/changes.txt b/docs/changes.txt
index f408857370..fa710c21e9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -94,6 +94,10 @@ All:
 
 All (GUI):
 
+- Fixed help viewer bug whereby the splitter sash in wxHtmlHelpWindow could
+  go underneath the left-hand pane, permanently, after resizing the
+  help window.
+
 All (Unix):
 
 - MIME types reading fixed when running under GNOME, reading .desktop
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index ab52ea8743..c5a00071a9 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -563,9 +563,10 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
     // showtime
     if ( m_NavigPan && m_Splitter )
     {
-        m_Splitter->SetMinimumPaneSize(20);
-        if ( m_Cfg.navig_on )
-            m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+        if (m_NavigPan)
+            m_Splitter->SetMinimumPaneSize(m_NavigPan->GetBestSize().x);
+        else
+            m_Splitter->SetMinimumPaneSize(20);
 
         if ( m_Cfg.navig_on )
         {