diff --git a/eeschema/dialogs/dialog_lib_new_component.cpp b/eeschema/dialogs/dialog_lib_new_component.cpp
index 3ffb0e8569..76e22aaba3 100644
--- a/eeschema/dialogs/dialog_lib_new_component.cpp
+++ b/eeschema/dialogs/dialog_lib_new_component.cpp
@@ -3,7 +3,9 @@
DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( wxWindow* parent ) :
DIALOG_LIB_NEW_COMPONENT_BASE( parent )
{
- /* Required to make escape key work correctly in wxGTK. */
- m_sdbSizerOK->SetFocus();
+ // initial focus should be on first editable field.
+ m_textName->SetFocus();
+
+ // What happens when user presses "Enter"? OK button! OK?
m_sdbSizerOK->SetDefault();
}
diff --git a/eeschema/dialogs/dialog_lib_new_component.fbp b/eeschema/dialogs/dialog_lib_new_component.fbp
index eabf24c837..9eb55f1c65 100644
--- a/eeschema/dialogs/dialog_lib_new_component.fbp
+++ b/eeschema/dialogs/dialog_lib_new_component.fbp
@@ -20,8 +20,10 @@
.
1
+ 1
1
1
+ UI
1
0