diff --git a/mailnews/base/resources/content/mailWidgets.xml b/mailnews/base/resources/content/mailWidgets.xml
index 5fc62a335024..7214221d29d0 100644
--- a/mailnews/base/resources/content/mailWidgets.xml
+++ b/mailnews/base/resources/content/mailWidgets.xml
@@ -265,7 +265,7 @@
        currently handles arbitrary text entry, and menulists for priority and
        status
   -->
-  <binding id="searchvalue" name="searchValue" extends="xul:deck">
+  <binding id="searchvalue" name="searchValue">
     <!-- yeah yeah, this stuff needs to be localized. I'm working on it! -->
     <content>
       <xul:textbox flex="1" class="search-value-textbox"/>
diff --git a/themes/classic/messenger/mac/messenger.css b/themes/classic/messenger/mac/messenger.css
index d5fd1866f5a6..e8ec72b95733 100644
--- a/themes/classic/messenger/mac/messenger.css
+++ b/themes/classic/messenger/mac/messenger.css
@@ -379,6 +379,7 @@ searchoperator
 
 searchvalue 
   {
+    display: -moz-xul-deck;
     -moz-binding          : url(chrome://messenger/content/mailWidgets.xml#searchvalue);
   }
 
diff --git a/themes/classic/messenger/win/messenger.css b/themes/classic/messenger/win/messenger.css
index fb793898fda8..d12fb75d8b08 100644
--- a/themes/classic/messenger/win/messenger.css
+++ b/themes/classic/messenger/win/messenger.css
@@ -406,6 +406,7 @@ searchoperator
 
 searchvalue 
   {
+    display: -moz-xul-deck;
     -moz-binding          : url(chrome://messenger/content/mailWidgets.xml#searchvalue);
   }
 
diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index ba766192a2c3..8e031276b796 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -364,6 +364,7 @@ searchoperator {
 }
 
 searchvalue {
+  display: -moz-xul-deck;
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#searchvalue");
 }
 
diff --git a/xpfe/global/resources/content/menulistBindings.xml b/xpfe/global/resources/content/menulistBindings.xml
index 816afa09954a..ce64a02a6f59 100644
--- a/xpfe/global/resources/content/menulistBindings.xml
+++ b/xpfe/global/resources/content/menulistBindings.xml
@@ -17,7 +17,7 @@
       <children includes="menupopup"/>
     </content>
     <handlers>
-      <handler event="command" phase="capturing" action="if (event.target.localName == 'menuitem') this.selectedItem = event.target;"/>
+      <handler event="command" phase="capturing" action="if (event.originalTarget.localName == 'menuitem') this.selectedItem = event.originalTarget;"/>
       <handler event="create">
         <![CDATA[
           if (event.target.parentNode == this && this.selectedItem) {