diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index a89c1817d95b..f54926eba91b 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -164,7 +164,6 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
     }
 
     textControl->SetTabIndex(-1);
-    textControl->SetDisabled(PR_TRUE);
     textControl->SetReadOnly(PR_TRUE);
   }
 
diff --git a/layout/style/forms.css b/layout/style/forms.css
index e2e8bc83e308..05cd26451b48 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -356,13 +356,9 @@ input[type="file"] {
   border-style: none !important;
 }
 
-input[type="file"] > input[type="text"][disabled] {
+input[type="file"] > input[type="text"] {
   border-color: inherit;
   background-color: inherit;
-  -moz-user-focus: ignore !important;
-  /* enable user input so that clicking on the control can bring up the
-     file dialog. It's still read-only. */
-  -moz-user-input: enabled;
   color: inherit;
   font-size: inherit;
   height: inherit;