diff --git a/lib/templates/chooser.mustache b/lib/templates/chooser.mustache
index 5396e294791..c774d3ef656 100644
--- a/lib/templates/chooser.mustache
+++ b/lib/templates/chooser.mustache
@@ -57,14 +57,12 @@
                     </div>
                     <div class="alloptions">
                         {{#sections}}
-                            <div class="moduletypetitle">
-                                <label for="item_{{id}}">
-                                    <span class="typename">{{label}}</span>
-                                </label>
-                            </div>
-                            {{#items}}
-                                {{>core/chooser_item}}
-                            {{/items}}
+                            <fieldset>
+                                <legend class="moduletypetitle">{{label}}</legend>
+                                {{#items}}
+                                    {{>core/chooser_item}}
+                                {{/items}}
+                            </fieldset>
                         {{/sections}}
                     </div>
                 </div>
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index f8001e5b271..57cc1fc07af 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -1397,6 +1397,8 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     text-transform: uppercase;
     padding-top: 1.2em;
     padding-bottom: 0.4em;
+    margin-bottom: 0.5rem;
+    font-size: 100%;
 }
 
 .choosercontainer #chooseform .option .typename,
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 3c19d5449ab..b8f8d9a3c4c 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -9881,7 +9881,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .choosercontainer #chooseform .moduletypetitle {
   text-transform: uppercase;
   padding-top: 1.2em;
-  padding-bottom: 0.4em; }
+  padding-bottom: 0.4em;
+  margin-bottom: 0.5rem;
+  font-size: 100%; }
 
 .choosercontainer #chooseform .option .typename,
 .choosercontainer #chooseform .nonoption .typename {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index d124a831263..64c3589ff41 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10118,7 +10118,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .choosercontainer #chooseform .moduletypetitle {
   text-transform: uppercase;
   padding-top: 1.2em;
-  padding-bottom: 0.4em; }
+  padding-bottom: 0.4em;
+  margin-bottom: 0.5rem;
+  font-size: 100%; }
 
 .choosercontainer #chooseform .option .typename,
 .choosercontainer #chooseform .nonoption .typename {