diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_input.js b/browser/base/content/test/contextMenu/browser_contextmenu_input.js
index 8ed8b2792e22..37d91e341918 100644
--- a/browser/base/content/test/contextMenu/browser_contextmenu_input.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu_input.js
@@ -106,7 +106,6 @@ add_task(async function test_password_input() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["signon.generation.enabled", false],
-      ["layout.forms.input-type-show-password-button.enabled", true],
     ],
   });
   todo(
@@ -137,8 +136,8 @@ add_task(async function test_password_input() {
       false,
       "context-selectall",
       null,
-      "context-toggle-show-password",
-      null,
+      // "context-toggle-show-password",
+      // null,
     ],
     {
       skipFocusChange: true,
diff --git a/browser/locales/en-US/browser/browserContext.ftl b/browser/locales/en-US/browser/browserContext.ftl
index d490b5f2aad5..1070c729a8f6 100644
--- a/browser/locales/en-US/browser/browserContext.ftl
+++ b/browser/locales/en-US/browser/browserContext.ftl
@@ -450,6 +450,7 @@ main-context-menu-open-link-in-container-tab =
     .label = Open Link in New { $containerName } Tab
     .accesskey = T
 
+# FIXME(emilio): Every single letter has a conflicting accesskey, UX needed.
 main-context-menu-toggle-show-password =
     .label = Show Password
     .accesskey = d