--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -433,18 +433,17 @@ nsContextMenu.prototype = {
       }.bind(this));
     }
   },
 
   // Set various context menu attributes based on the state of the world.
   setTarget: function (aNode, aRangeParent, aRangeOffset) {
     const xulNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
     if (aNode.namespaceURI == xulNS ||
-        aNode.nodeType == Node.DOCUMENT_NODE ||
-        this.isTargetAFormControl(aNode)) {
+        aNode.nodeType == Node.DOCUMENT_NODE) {
       this.shouldDisplay = false;
       return;
     }
 
     // Initialize contextual info.
     this.onImage           = false;
     this.onLoadedImage     = false;
     this.onCompletedImage  = false;
@@ -1292,28 +1291,16 @@ nsContextMenu.prototype = {
     return "contextMenu.target     = " + this.target + "\n" +
            "contextMenu.onImage    = " + this.onImage + "\n" +
            "contextMenu.onLink     = " + this.onLink + "\n" +
            "contextMenu.link       = " + this.link + "\n" +
            "contextMenu.inFrame    = " + this.inFrame + "\n" +
            "contextMenu.hasBGImage = " + this.hasBGImage + "\n";
   },
 
-  // Returns true if aNode is a from control (except text boxes and images).
-  // This is used to disable the context menu for form controls.
-  isTargetAFormControl: function(aNode) {
-    if (aNode instanceof HTMLInputElement)
-      return (!aNode.mozIsTextField(false) && aNode.type != "image");
-
-    return (aNode instanceof HTMLButtonElement) ||
-           (aNode instanceof HTMLSelectElement) ||
-           (aNode instanceof HTMLOptionElement) ||
-           (aNode instanceof HTMLOptGroupElement);
-  },
-
   isTargetATextBox: function(node) {
     if (node instanceof HTMLInputElement)
       return node.mozIsTextField(false);
 
     return (node instanceof HTMLTextAreaElement);
   },
 
   isTargetAKeywordField: function(aNode) {

--- a/browser/base/content/test/browser_bug424101.js
+++ b/browser/base/content/test/browser_bug424101.js
@@ -29,25 +29,25 @@ function test() {
       let contextMenu = new nsContextMenu(contentAreaContextMenu, gBrowser);
 
       is(contextMenu.shouldDisplay, expected, "context menu behavior for <" + tag + "> is wrong");
     };
 
     testInput("text", true);
     testInput("password", true);
     testInput("image", true);
-    testInput("button", false);
-    testInput("submit", false);
-    testInput("reset", false);
-    testInput("checkbox", false);
-    testInput("radio", false);
-    testElement("button", false);
-    testElement("select", false);
-    testElement("option", false);
-    testElement("optgroup", false);
+    testInput("button", true);
+    testInput("submit", true);
+    testInput("reset", true);
+    testInput("checkbox", true);
+    testInput("radio", true);
+    testElement("button", true);
+    testElement("select", true);
+    testElement("option", true);
+    testElement("optgroup", true);
 
     // cleanup
     document.popupNode = null;
     gBrowser.removeCurrentTab();
     finish();
   }, true);
   content.location = "data:text/html,test";
 }