diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp
index eba2dd47f9..760b0785f7 100644
--- a/eeschema/dialogs/dialog_sheet_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties.cpp
@@ -77,6 +77,11 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
     if( m_frame->GetColorSettings()->GetOverrideSchItemColors() )
         m_infoBar->ShowMessage( _( "Note: individual item colors overridden in Preferences." ) );
 
+    wxSize minSize = m_pageNumberTextCtrl->GetMinSize();
+    int    minWidth = m_pageNumberTextCtrl->GetTextExtent( wxT( "XXX.XXX" ) ).GetWidth();
+
+    m_pageNumberTextCtrl->SetMinSize( wxSize( minWidth, minSize.GetHeight() ) );
+
     wxToolTip::Enable( true );
     SetupStandardButtons();
 
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index f460324860..6d20450211 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -1102,7 +1102,7 @@ void SCH_SHEET::Plot( PLOTTER* aPlotter, bool aBackground ) const
     // Make the sheet object a clickable hyperlink (e.g. for PDF plotter)
     std::vector<wxString> properties;
 
-    properties.emplace_back( EDA_TEXT::GotoPageHref( getPageNumber( findSelf() ) ) );
+    properties.emplace_back( EDA_TEXT::GotoPageHref( findSelf().GetPageNumber() ) );
 
     for( const SCH_FIELD& field : GetFields() )
     {