diff --git a/common/widgets/net_selector.cpp b/common/widgets/net_selector.cpp
index 3a7ec0d6fa..f74fcd8118 100644
--- a/common/widgets/net_selector.cpp
+++ b/common/widgets/net_selector.cpp
@@ -53,7 +53,7 @@ class NET_SELECTOR_POPUP : public wxDialog
 public:
     NET_SELECTOR_POPUP( wxWindow* aParent, const wxPoint& aPos, const wxSize& aSize,
                         NETINFO_LIST* aNetInfoList ) :
-            wxDialog( aParent, wxID_ANY, wxEmptyString, aPos, aSize, wxBORDER_NONE ),
+            wxDialog( aParent, wxID_ANY, wxEmptyString, aPos, aSize, wxSIMPLE_BORDER ),
             m_popupWidth( -1 ),
             m_maxPopupHeight( 1000 ),
             m_netinfoList( aNetInfoList ),
@@ -70,13 +70,13 @@ public:
         mainSizer = new wxBoxSizer( wxVERTICAL );
 
         wxStaticText* title = new wxStaticText( this, wxID_ANY, _( "Filter:" ) );
-        mainSizer->Add( title, 0, wxTOP|wxLEFT|wxRIGHT, 3 );
+        mainSizer->Add( title, 0, wxLEFT|wxRIGHT, 2 );
 
         m_filterCtrl = new wxTextCtrl( this, wxID_ANY );
-        mainSizer->Add( m_filterCtrl, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT, 3 );
+        mainSizer->Add( m_filterCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 2 );
 
-        m_netListBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, 0, wxLB_NO_SB );
-        mainSizer->Add( m_netListBox, 0, wxALL|wxEXPAND, 3 );
+        m_netListBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, 0, wxLB_NEEDED_SB );
+        mainSizer->Add( m_netListBox, 0, wxALL|wxEXPAND, 2 );
 
         SetSizer( mainSizer );
         Layout();
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index cc941351a6..088befee91 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -96,7 +96,7 @@ static const LSET std_pad_layers[] =
 void PCB_BASE_FRAME::InstallPadOptionsFrame( D_PAD* aPad )
 {
     DIALOG_PAD_PROPERTIES dlg( this, aPad );
-    dlg.ShowModal();       // QuasiModal required for NET_SELECTOR
+    dlg.ShowQuasiModal();       // QuasiModal required for NET_SELECTOR
 }