diff --git a/src/frontends/qt4/QSearch.cpp b/src/frontends/qt4/QSearch.cpp
index e06b0b325e..cc0fc57a6a 100644
--- a/src/frontends/qt4/QSearch.cpp
+++ b/src/frontends/qt4/QSearch.cpp
@@ -96,6 +96,7 @@ void QSearchDialog::findClicked()
 		wordsCB->isChecked(),
 		backwardsCB->isChecked());
 	uniqueInsert(findCO, findCO->currentText());
+	findCO->lineEdit()->setSelection(0, findCO->lineEdit()->text().length());
 }
 
 
diff --git a/status.15x b/status.15x
index 01cbb23373..cc00233825 100644
--- a/status.15x
+++ b/status.15x
@@ -112,6 +112,8 @@ What's new
 
 - Fix failure to close window when dirty document is saved (bug 4170).
 
+- Highlight search text (bug 3999).
+
 
 * DOCUMENTATION