diff --git a/browser/base/content/contentSearchUI.js b/browser/base/content/contentSearchUI.js
index e14f23b1e24e..b6fa0a8e1794 100644
--- a/browser/base/content/contentSearchUI.js
+++ b/browser/base/content/contentSearchUI.js
@@ -623,17 +623,12 @@ ContentSearchUIController.prototype = {
return;
}
let searchWithHeader = document.getElementById("contentSearchSearchWithHeader");
- while (searchWithHeader.firstChild) {
- searchWithHeader.firstChild.remove();
- }
if (this.input.value) {
- let html = "";
- html = this._strings.searchForKeywordsWith.replace("%S", html);
- searchWithHeader.innerHTML = html;
- return;
+ searchWithHeader.innerHTML = this._strings.searchForSomethingWith;
+ searchWithHeader.querySelector('.contentSearchSearchWithHeaderSearchText').textContent = this.input.value;
+ } else {
+ searchWithHeader.textContent = this._strings.searchWithHeader;
}
- searchWithHeader.appendChild(document.createTextNode(this._strings.searchWithHeader));
},
_speculativeConnect: function () {
diff --git a/browser/locales/en-US/chrome/browser/search.properties b/browser/locales/en-US/chrome/browser/search.properties
index 8649d5c936b4..d7cd339cc94d 100644
--- a/browser/locales/en-US/chrome/browser/search.properties
+++ b/browser/locales/en-US/chrome/browser/search.properties
@@ -33,14 +33,15 @@ cmd_addFoundEngine=Add "%S"
# grouped in a submenu using cmd_addFoundEngineMenu as a label.
cmd_addFoundEngineMenu=Add search engine
-# LOCALIZATION NOTE (searchForKeywordsWith):
+# LOCALIZATION NOTE (searchForSomethingWith):
# This string is used to build the header above the list of one-click
-# search providers: "Search for with:"
-searchForKeywordsWith=Search for %S with:
+# search providers: "Search for with:"
+# NB: please leave the and its class exactly as it is in English.
+searchForSomethingWith=Search for with:
# LOCALIZATION NOTE (searchWithHeader):
# The wording of this string should be as close as possible to
-# searchForKeywordsWith. This string will be used when the user
+# searchForSomethingWith. This string will be used when the user
# has not typed anything.
searchWithHeader=Search with:
diff --git a/browser/modules/ContentSearch.jsm b/browser/modules/ContentSearch.jsm
index 5c313d3c54d3..e1f25dd2b803 100644
--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -114,7 +114,7 @@ this.ContentSearch = {
}
this._searchSuggestionUIStrings = {};
let searchBundle = Services.strings.createBundle("chrome://browser/locale/search.properties");
- let stringNames = ["searchHeader", "searchPlaceholder", "searchForKeywordsWith",
+ let stringNames = ["searchHeader", "searchPlaceholder", "searchForSomethingWith",
"searchWithHeader", "searchSettings"];
for (let name of stringNames) {
this._searchSuggestionUIStrings[name] = searchBundle.GetStringFromName(name);