diff --git a/mozilla/browser/base/content/browser.css b/mozilla/browser/base/content/browser.css
index ddf022afc8c..bdb10ae5775 100644
--- a/mozilla/browser/base/content/browser.css
+++ b/mozilla/browser/base/content/browser.css
@@ -1,18 +1,13 @@
-/* ::::: search bar ::::: */
 searchbar {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar");
 }
 
-#SearchAutoComplete {
-  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-result-popup");
-}
-
 /* ::::: location bar ::::: */
 #urlbar {
   -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar);
 }
 
-#UrlbarAutoComplete {
+#PopupAutoComplete {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-result-popup");
 }
 
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 5b144e8186b..753fb914352 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -98,9 +98,7 @@
            onclick="checkForMiddleClick(this, event);"/>
     <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
 
-    <panel type="autocomplete" chromedir="&locale.dir;" id="UrlbarAutoComplete" noautofocus="true"/>
-    <panel type="autocomplete" chromedir="&locale.dir;" id="SearchAutoComplete" noautofocus="true"/>
-    <panel type="autocomplete" chromedir="&locale.dir;" id="ContentAutoComplete" noautofocus="true"/>
+    <panel type="autocomplete" chromedir="&locale.dir;" id="PopupAutoComplete" noautofocus="true"/>
 
     <panel id="editBookmarkPanel" orient="vertical">
       <vbox id="editBookmarkPanelContent" flex="1"/>
@@ -222,7 +220,7 @@
                      chromedir="&locale.dir;"
                      type="autocomplete"
                      autocompletesearch="history" 
-                     autocompletepopup="UrlbarAutoComplete"
+                     autocompletepopup="PopupAutoComplete"
                      completeselectedindex="true"
                      tabscrolling="true"
                      showcommentcolumn="true"
@@ -302,8 +300,7 @@
       <toolbaritem id="search-container" title="&searchItem.title;" 
                    align="center" class="chromeclass-toolbar-additional"
                    flex="100" persist="width">
-        <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"
-                   autocompletepopup="SearchAutoComplete"/>
+        <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
       </toolbaritem>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -433,7 +430,7 @@
                     flex="1" contenttooltip="aHTMLTooltip"
                     contentcontextmenu="contentAreaContextMenu"
                     onnewtab="BrowserOpenTab();"
-                    autocompletepopup="ContentAutoComplete"
+                    autocompletepopup="PopupAutoComplete"
                     ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);"
                     onclick="return contentAreaClick(event, false);"/>
       </vbox>
diff --git a/mozilla/browser/base/content/urlbarBindings.xml b/mozilla/browser/base/content/urlbarBindings.xml
index 8e6215c5576..295827894ea 100644
--- a/mozilla/browser/base/content/urlbarBindings.xml
+++ b/mozilla/browser/base/content/urlbarBindings.xml
@@ -504,8 +504,7 @@
 
   </binding>
 
-  <binding id="urlbar-result-popup"
-           extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
+  <binding id="urlbar-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
     <implementation>
       <method name="onPopupClick">
         <parameter name="aEvent"/>
diff --git a/mozilla/browser/components/search/content/search.xml b/mozilla/browser/components/search/content/search.xml
index e28afa78162..2d28fdc45f0 100644
--- a/mozilla/browser/components/search/content/search.xml
+++ b/mozilla/browser/components/search/content/search.xml
@@ -90,6 +90,7 @@
                        anonid="searchbar-textbox"
                        type="autocomplete"
                        flex="1"
+                       autocompletepopup="PopupAutoComplete"
                        autocompletesearch="search-autocomplete"
                        autocompletesearchparam="searchbar-history"
                        timeout="250"
@@ -97,7 +98,7 @@
                        completeselectedindex="true"
                        showcommentcolumn="true"
                        tabscrolling="true"
-                       xbl:inherits="disabled,disableautocomplete,autocompletepopup,searchengine,src">
+                       xbl:inherits="disabled,disableautocomplete,searchengine,src">
           </xul:textbox>
         </xul:hbox>
 
@@ -838,35 +839,4 @@
       <children/>
     </content>
   </binding>
-
-  <binding id="searchbar-result-popup"
-           extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
-    <implementation>
-      <method name="onPopupClick">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          var controller = this.view.QueryInterface(Components.interfaces.nsIAutoCompleteController);
-
-          // default action on unmodified left-click
-          if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey &&
-              !aEvent.altKey && !aEvent.metaKey) {
-            controller.handleEnter();
-          }
-          // completely ignore right-clicks
-          else if (aEvent.button != 2) {
-            // handle search bar click
-            var search = controller.getValueAt(this.tree.view.selection.currentIndex);
-            var textbox = this.mInput;
-
-            // close the autocomplete popup and copy the selected value to the search box
-            this.closePopup();
-            textbox.value = search;
-            // open the search results according to the clicking subtlety
-            var where = whereToOpenLink(aEvent, false, true);
-            textbox._getParentSearchbar().doSearch(search, where);
-          }
-        ]]></body>
-      </method>
-    </implementation>
-  </binding>
 </bindings>
diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css
index 3db60202bf7..2ca9a55b530 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.css
+++ b/mozilla/browser/themes/winstripe/browser/browser.css
@@ -914,15 +914,15 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   direction: ltr;
 }
 
-#UrlbarAutoComplete {
+#PopupAutoComplete {
   direction: ltr !important;
 }
 
-#UrlbarAutoComplete[chromedir="rtl"] > tree > treerows {
+#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
   direction: rtl;
 }
 
-#UrlbarAutoComplete .autocomplete-treebody {
+#PopupAutoComplete .autocomplete-treebody {
   direction: ltr;
 }