diff --git a/common/displlst.cpp b/common/displlst.cpp
index 0b01257a44..4310293022 100644
--- a/common/displlst.cpp
+++ b/common/displlst.cpp
@@ -65,6 +65,8 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl
 
     m_filterBox->SetFocus();
 
+    m_sdbSizerOK->SetDefault();
+
     // this line fixes an issue on Linux Ubuntu using Unity (dialog not shown),
     // and works fine on all systems
     GetSizer()->Fit(  this );
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index d00f150cc3..7a1e12f4b8 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -728,6 +728,8 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintInLibrary( wxString activeLibrary, MODUL
     if( dlg.GetChildren().DeleteObject( nameTextCtrl ) )
         dlg.GetChildren().Insert( nameTextCtrl );
 
+    nameTextCtrl->SetFocus();
+
     dlg.Layout();
     mainSizer->Fit( &dlg );