--- a/toolkit/themes/linux/global/menu.css
+++ b/toolkit/themes/linux/global/menu.css
@@ -31,16 +31,23 @@ menuitem[_moz-menuactive="true"] {
   color: -moz-menuhovertext;
   background-color: -moz-menuhover;
 }
 
 menuitem[customoptionstyling="true"] {
   -moz-appearance: none;
 }
 
+menuitem[customoptionstyling="true"][_moz-menuactive="true"] {
+  /* -moz-menuhovertext and -moz-menuhover only apply
+     when -moz-appearance is set to menuitem. */
+  color: highlighttext;
+  background-color: highlight;
+}
+
 menu[disabled="true"],
 menuitem[disabled="true"],
 menucaption[disabled="true"] {
   color: GrayText;
 }
 
 menubar > menu {
   padding: 0px 4px;

--- a/toolkit/themes/linux/global/popup.css
+++ b/toolkit/themes/linux/global/popup.css
@@ -94,8 +94,11 @@ tooltip[titletip="true"] {
 
 /* rules for popups associated with menulists */
 
 menulist > menupopup {
   padding: 0px;
   min-width: 0px;
 }
 
+menupopup[customoptionstyling="true"] {
+  -moz-appearance: none;
+}