diff --git a/src/libs/utils/completinglineedit.cpp b/src/libs/utils/completinglineedit.cpp
index 5bbc5d88398..620609ef9cf 100644
--- a/src/libs/utils/completinglineedit.cpp
+++ b/src/libs/utils/completinglineedit.cpp
@@ -63,10 +63,8 @@ void CompletingLineEdit::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Down && !e->modifiers()) {
         if (QCompleter *comp = completer()) {
-            if (text().isEmpty() && !comp->popup()->isVisible()) {
-                comp->setCompletionPrefix(QString());
+            if (!comp->popup()->isVisible())
                 comp->complete();
-            }
         }
     }
     return QLineEdit::keyPressEvent(e);
diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index 4cf055ae3c4..fcfb2905bbc 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -174,6 +174,7 @@ HistoryCompleter::HistoryCompleter(const QString &historyKey, QObject *parent)
 {
     QTC_ASSERT(!historyKey.isEmpty(), return);
     QTC_ASSERT(theSettings, return);
+    setCompletionMode(QCompleter::UnfilteredPopupCompletion);
 
     d->historyKey = QLatin1String("CompleterHistory/") + historyKey;
     d->list = theSettings->value(d->historyKey).toStringList();