diff --git a/app/javascript/application.scss b/app/javascript/application.scss
index 713db71d..8a685a2a 100644
--- a/app/javascript/application.scss
+++ b/app/javascript/application.scss
@@ -21,6 +21,18 @@
   outline-offset: 4px;
 }
 
+/* Transfer focus ring from toggle to its full menu row label */
+.menu label:has(.toggle:focus-visible) {
+  outline-color: rgb(14, 99, 200);
+  outline-style: solid;
+  outline-width: 8px;
+  outline-offset: 4px;
+}
+
+.menu label .toggle:focus-visible {
+  outline: none;
+}
+
 a[href],
 input[type='checkbox'],
 input[type='submit'],
diff --git a/app/javascript/form.scss b/app/javascript/form.scss
index 28ac4b1a..e47af9ac 100644
--- a/app/javascript/form.scss
+++ b/app/javascript/form.scss
@@ -21,6 +21,18 @@
   outline-offset: 4px;
 }
 
+/* Transfer focus ring from toggle to its full menu row label */
+.menu label:has(.toggle:focus-visible) {
+  outline-color: rgb(14, 99, 200);
+  outline-style: solid;
+  outline-width: 8px;
+  outline-offset: 4px;
+}
+
+.menu label .toggle:focus-visible {
+  outline: none;
+}
+
 a[href],
 input[type='checkbox'],
 input[type='submit'],