diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index b0d2e9601e..36a7fa68ad 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -52,6 +52,9 @@
 #include <wx/choicdlg.h>
 
 
+int DIALOG_PAD_PROPERTIES::m_page = 0;     // remember the last open page during session
+
+
 // list of pad shapes, ordered like the pad shape wxChoice in dialog.
 static PAD_SHAPE code_shape[] =
 {
@@ -270,6 +273,15 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad
     // Initialize canvas to be able to display the dummy pad:
     prepareCanvas();
 
+    m_notebook->SetSelection( m_page );
+
+    switch( m_page )
+    {
+    case 0: SetInitialFocus( m_padNumCtrl );     break;
+    case 1: SetInitialFocus( m_thermalGapCtrl ); break;
+    case 2: SetInitialFocus( m_clearanceCtrl );  break;
+    }
+
     SetInitialFocus( m_padNumCtrl );
     SetupStandardButtons();
     m_canUpdate = true;
@@ -303,6 +315,8 @@ DIALOG_PAD_PROPERTIES::~DIALOG_PAD_PROPERTIES()
                                   wxCommandEventHandler( DIALOG_PAD_PROPERTIES::OnValuesChanged ),
                                   nullptr, this );
 
+    m_page = m_notebook->GetSelection();
+
     delete m_previewPad;
     delete m_axisOrigin;
 }
diff --git a/pcbnew/dialogs/dialog_pad_properties.h b/pcbnew/dialogs/dialog_pad_properties.h
index f5bcb11c25..c85912bab5 100644
--- a/pcbnew/dialogs/dialog_pad_properties.h
+++ b/pcbnew/dialogs/dialog_pad_properties.h
@@ -138,7 +138,10 @@ private:
     std::vector<PCB_SHAPE*>  m_highlight;     // shapes highlighted in GAL mode
     PCB_DRAW_PANEL_GAL*      m_padPreviewGAL;
     KIGFX::ORIGIN_VIEWITEM*  m_axisOrigin;    // origin of the preview canvas
+
     static bool              m_sketchPreview; // session storage
+    static int               m_page;          // remember the last open page during session
+
 
     UNIT_BINDER m_posX, m_posY;
     UNIT_BINDER m_sizeX, m_sizeY;