--- a/suite/common/search/search.xml
+++ b/suite/common/search/search.xml
@@ -508,21 +508,20 @@
           return;
 
         this.focus();
         this.select();
       ]]></handler>
 
       <handler event="popupshowing" action="this.rebuildPopupDynamic();"/>
 
-      <handler event="DOMMouseScroll" phase="capturing"><![CDATA[
-        var key = /Mac/.test(navigator.platform) ? event.metaKey : event.ctrlKey;
-        if (key)
-          this.selectEngine(event, event.detail > 0);
-      ]]></handler>
+      <handler event="DOMMouseScroll"
+               phase="capturing"
+               modifiers="accel"
+               action="this.selectEngine(event, (event.detail > 0));"/>
     </handlers>
   </binding>
 
   <binding id="searchbar-textbox"
       extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
     <implementation implements="nsIObserver">
       <constructor><![CDATA[
         if (document.getBindingParent(this).parentNode.parentNode.localName ==