diff --git a/mozilla/browser/components/search/content/search.xml b/mozilla/browser/components/search/content/search.xml
index 7e8d4c9cf67..58cd15781cb 100644
--- a/mozilla/browser/components/search/content/search.xml
+++ b/mozilla/browser/components/search/content/search.xml
@@ -166,15 +166,18 @@
         <body><![CDATA[
           if (aTopic == "browser-search-engine-modified") {
             switch (aVerb) {
+            case "engine-current":
+              // The current engine was changed.  Rebuilding the menu appears to
+              // confuse its idea of whether it should be open when it's just
+              // been clicked, so we force it to close now.
+              this._popup.hidePopup();
+              // Fall through.
             case "engine-removed":
             case "engine-added":
             case "engine-changed":
               // An engine was removed (or hidden) or added, or an icon was
-              // changed
+              // changed.
               this.rebuildPopup();
-              // Fall through
-            case "engine-current":
-              // The current engine was changed
               this.updateDisplay();
             }
           }
@@ -214,6 +217,11 @@
             menuitem.setAttribute("label", this._engines[i].name);
             menuitem.setAttribute("id", this._engines[i].name);
             menuitem.setAttribute("class", "menuitem-iconic searchbar-engine-menuitem");
+            // Since this menu is rebuilt by the observer method whenever a new
+            // engine is selected, the "selected" attribute does not need to be 
+            // explicitly cleared anywhere.
+            if (this._engines[i] == this.currentEngine)
+              menuitem.setAttribute("selected", "true");
             if (this._engines[i].iconURI)
               menuitem.setAttribute("src", this._engines[i].iconURI.spec);
             popup.insertBefore(menuitem, popup.firstChild);
diff --git a/mozilla/browser/themes/pinstripe/browser/searchbar.css b/mozilla/browser/themes/pinstripe/browser/searchbar.css
index 6bbbd34db82..59a2dbc5c6b 100644
--- a/mozilla/browser/themes/pinstripe/browser/searchbar.css
+++ b/mozilla/browser/themes/pinstripe/browser/searchbar.css
@@ -44,3 +44,7 @@
 .search-go-button[disabled="true"]{
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
+
+.searchbar-engine-menuitem[selected="true"] .menu-iconic-text {
+  font-weight: bold;
+}
diff --git a/mozilla/browser/themes/winstripe/browser/searchbar.css b/mozilla/browser/themes/winstripe/browser/searchbar.css
index b73c7d73298..dc75b452377 100644
--- a/mozilla/browser/themes/winstripe/browser/searchbar.css
+++ b/mozilla/browser/themes/winstripe/browser/searchbar.css
@@ -64,3 +64,7 @@
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
+
+.searchbar-engine-menuitem[selected="true"] .menu-iconic-text {
+  font-weight: bold;
+}
