diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index 004ff7d441cf..f12fcdf5b3bc 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -2094,9 +2094,9 @@ var MenuListHelperUI = {
     for (let i = 0; i < children.length; i++) {
       let child = children[i];
       let item = document.createElement("richlistitem");
-      if (child.selected)
-        item.setAttribute("selected", child.selected);
-      item.setAttribute("class", "menulist-command");
+      // Add selected as a class name instead of an attribute to not being overidden
+      // by the richlistbox behavior (it sets the "current" and "selected" attribute
+      item.setAttribute("class", "menulist-command" + (child.selected ? " selected" : ""));
 
       let label = document.createElement("label");
       label.setAttribute("value", child.label);
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index c570ab7ec04c..e7e1747554c6 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -540,8 +540,8 @@
     </vbox>
 
     <hbox id="menulist-container" class="window-width window-height context-block" top="0" left="0" hidden="true" flex="1">
-      <vbox id="menulist-popup" class="dialog-dark"> 
-        <richlistbox id="menulist-commands" onselect="MenuListHelperUI.selectByIndex(this.selectedIndex)"/>
+      <vbox id="menulist-popup" class="dialog-dark">
+        <richlistbox id="menulist-commands" onclick="if (event.target != this) MenuListHelperUI.selectByIndex(this.selectedIndex);" flex="1"/>
       </vbox>
     </hbox>
 
diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css
index aafec1444ede..f7e9f9442733 100644
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -1543,9 +1543,9 @@ pageaction:hover:active > vbox > .pageaction-desc {
   background: #8db8d8;
 }
 
-.menulist-command[selected="true"] {
-  pointer-events: none;
+.menulist-command.selected {
   background: #8db8d8;
+  pointer-events: none;
 }
 
 /* context popup ----------------------------------------------------------- */