--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1286,16 +1286,17 @@ file, You can obtain one at http://mozil
       </xul:hbox>
       <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox"
                        flex="1"/>
       <xul:hbox anonid="footer">
         <children/>
         <xul:vbox anonid="one-off-search-buttons"
                   class="search-one-offs"
                   compact="true"
+                  includecurrentengine="true"
                   flex="1"/>
       </xul:hbox>
     </content>
 
     <implementation>
       <field name="_maxResults">0</field>
 
       <field name="_bundle" readonly="true">

--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1406,19 +1406,21 @@
             settingsButton.nextSibling.remove();
 
           let Preferences =
             Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
           let pref = Preferences.get("browser.search.hiddenOneOffs");
           let hiddenList = pref ? pref.split(",") : [];
 
           let currentEngineName = Services.search.currentEngine.name;
-          let engines = Services.search.getVisibleEngines()
-                                .filter(e => e.name != currentEngineName &&
-                                             hiddenList.indexOf(e.name) == -1);
+          let includeCurrentEngine = this.getAttribute("includecurrentengine");
+          let engines = Services.search.getVisibleEngines().filter(e => {
+            return (includeCurrentEngine || e.name != currentEngineName) &&
+                   !hiddenList.includes(e.name);
+          });
 
           let header = document.getAnonymousElementByAttribute(this, "anonid",
                                                                "search-panel-one-offs-header")
           // header is a xul:deck so collapsed doesn't work on it, see bug 589569.
           header.hidden = list.collapsed = !engines.length;
 
           if (!engines.length)
             return;