diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp
index d6c32fdac8..4ad66402c1 100644
--- a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp
+++ b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp
@@ -29,7 +29,9 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWind
 
 	sbSizerEditOpt->Add( m_mouseDragIsDrag, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
 
-	m_cbAutoStartWires = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Automatically start wires on junctions and unused anchors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbAutoStartWires = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Automatically start wires on unconnected pins"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbAutoStartWires->SetToolTip( _("When enabled, you can start wiring by clicking on unconnected pins even when the wire tool is not active") );
+
 	sbSizerEditOpt->Add( m_cbAutoStartWires, 0, wxALL, 5 );
 
 
diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp
index dbd2671cba..96e0b4ee99 100644
--- a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp
+++ b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp
@@ -236,7 +236,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Automatically start wires on junctions and unused anchors</property>
+                                        <property name="label">Automatically start wires on unconnected pins</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -257,7 +257,7 @@
                                         <property name="style"></property>
                                         <property name="subclass">; ; Not forward_declare</property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
+                                        <property name="tooltip">When enabled, you can start wiring by clicking on unconnected pins even when the wire tool is not active</property>
                                         <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>