diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index e47037379d1a6e0207e33704cf6043f9fa968ff5..687a2b5b07e428876964d85cc96f1843623173ce 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -171,7 +171,7 @@ HistoryCompleter::HistoryCompleter(FancyLineEdit *lineEdit, const QString &histo
     d->historyKey = QLatin1String("CompleterHistory/") + historyKey;
     d->list = theSettings->value(d->historyKey).toStringList();
     d->lineEdit = lineEdit;
-    if (d->list.count())
+    if (d->list.count() && lineEdit->text().isEmpty())
         lineEdit->setText(d->list.at(0));
 
     setModel(d);