diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp
index cf6f3821cf..c28fdf113e 100644
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -29,6 +29,7 @@
 #include "support/lstrings.h"
 
 #include <QAbstractItemModel>
+#include <QCompleter>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QPushButton>
@@ -80,6 +81,10 @@ GuiThesaurus::GuiThesaurus(GuiView & lv)
 	languageCO->setModel(language_model);
 	languageCO->setModelColumn(2);
 
+	//bug #8138
+	if (entryCO->completer())
+		entryCO->completer()->setCompletionMode(QCompleter::PopupCompletion);
+
 	bc().setCancel(closePB);
 	bc().setApply(replacePB);
 	bc().addReadOnly(replaceED);