diff --git a/eeschema/dialogs/dialog_schematic_find.cpp b/eeschema/dialogs/dialog_schematic_find.cpp
index 63800ef534..52996a5a1c 100644
--- a/eeschema/dialogs/dialog_schematic_find.cpp
+++ b/eeschema/dialogs/dialog_schematic_find.cpp
@@ -265,7 +265,10 @@ void DIALOG_SCH_FIND::SetFindEntries( const wxArrayString& aEntries )
     m_comboFind->Append( aEntries );
 
     if( m_comboFind->GetCount() )
+    {
         m_comboFind->SetSelection( 0 );
+        m_comboFind->SelectAll();
+    }
 }
 
 
@@ -274,5 +277,8 @@ void DIALOG_SCH_FIND::SetReplaceEntries( const wxArrayString& aEntries )
     m_comboReplace->Append( aEntries );
 
     if( m_comboReplace->GetCount() )
+    {
         m_comboReplace->SetSelection( 0 );
+        m_comboFind->SelectAll();
+    }
 }