diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index e14094c3a6f..7cba81b8196 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -21,8 +21,8 @@
 {{/if}}
 
 {{#if showColorSchemeSelector}}
-  <div class="control-group color-scheme">
-    <label class="control-label">{{i18n "user.color_scheme"}}</label>
+  <fieldset class="control-group color-scheme">
+    <legend class="control-label">{{i18n "user.color_scheme"}}</legend>
     <div class="control-subgroup light-color-scheme">
       {{#if showDarkColorSchemeSelector}}
         <div class="instructions">{{i18n "user.color_schemes.regular" }}</div>
@@ -64,7 +64,7 @@
         {{preference-checkbox labelKey="user.color_scheme_default_on_all_devices" checked=makeColorSchemeDefault}}
       </div>
     {{/if}}
-  </div>
+  </fieldset>
 {{/if}}
 
 {{#if showDarkModeToggle}}
@@ -127,8 +127,8 @@
   </div>
 </div>
 
-<div class="control-group other">
-  <label class="control-label">{{i18n "user.other_settings"}}</label>
+<fieldset class="control-group other">
+  <legend class="control-label">{{i18n "user.other_settings"}}</legend>
 
   {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=model.user_option.external_links_in_new_tab class="pref-external-links"}}
   {{preference-checkbox labelKey="user.enable_quoting" checked=model.user_option.enable_quoting class="pref-enable-quoting"}}
@@ -154,7 +154,7 @@
     }}
   </div>
   {{preference-checkbox labelKey="user.skip_new_user_tips.description" checked=model.user_option.skip_new_user_tips  class="pref-new-user-tips"}}
-</div>
+</fieldset>
 
 {{plugin-outlet name="user-preferences-interface" args=(hash model=model save=(action "save"))}}