diff --git a/layout/style/forms.css b/layout/style/forms.css
index fa6fd67136e8..0b11c9b26bc8 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -307,6 +307,7 @@ option {
   text-indent: 0;
   white-space: nowrap !important;
   word-wrap: normal !important;
+  text-align: match-parent;
 }
 
 select > option {
@@ -447,6 +448,7 @@ input[type="file"] {
 input[type="file"] > xul|label {
   min-inline-size: 12em;
   -moz-padding-start: 5px;
+  text-align: match-parent;
 
   color: inherit;
   font-size: inherit;
@@ -481,11 +483,11 @@ input[type="color"]:-moz-system-metric(color-picker-available)::-moz-color-swatc
 }
 
 /* Try to make RTL <input type='file'> look nicer. */
-/* TODO: use text-align: match-parent when bug 645642 is fixed. */
+/* TODO: find a better solution than forcing direction: ltr on all file
+   input labels and remove this override -- bug 1161482 */
 input[type="file"]:-moz-dir(rtl) > xul|label {
   -moz-padding-start: 0px;
   -moz-padding-end: 5px;
-  text-align: right;
 }
 
 /* radio buttons */
diff --git a/layout/style/html.css b/layout/style/html.css
index d45745d598ef..0af3e5f2a997 100644
--- a/layout/style/html.css
+++ b/layout/style/html.css
@@ -587,6 +587,7 @@ ol {
 
 li {
   display: list-item;
+  text-align: match-parent;
 }
 
 /* nested lists have no top/bottom margins */