diff --git a/lib/grouplib.php b/lib/grouplib.php
index 730887178d3..01e60f4553e 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -805,7 +805,7 @@ function groups_print_course_menu($course, $urlroot, $return=false) {
         $output = $OUTPUT->render($select);
     }
 
-    $output = '<div class="groupselector">'.$output.'</div>';
+    $output = $OUTPUT->container($output, 'groupselector my-2 d-inline-block');
 
     if ($return) {
         return $output;
@@ -1004,7 +1004,7 @@ function groups_print_activity_menu($cm, $urlroot, $return=false, $hideallpartic
         $output = $OUTPUT->render($select);
     }
 
-    $output = '<div class="groupselector">'.$output.'</div>';
+    $output = $OUTPUT->container($output, 'groupselector my-2 d-inline-block');
 
     if ($return) {
         return $output;
diff --git a/lib/templates/single_select.mustache b/lib/templates/single_select.mustache
index 4db5b842b51..975cf1799f4 100644
--- a/lib/templates/single_select.mustache
+++ b/lib/templates/single_select.mustache
@@ -83,7 +83,7 @@
 }}
 
 <div class="{{classes}} d-inline-block">
-    <form method="{{method}}" action="{{action}}" class="d-flex flex-wrap align-items-center" id="{{formid}}">
+    <form method="{{method}}" action="{{action}}" class="d-flex flex-wrap align-items-center gap-2" id="{{formid}}">
         {{#params}}
             <input type="hidden" name="{{name}}" value="{{value}}">
         {{/params}}
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index d0613419cd5..c0789355c0c 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -506,16 +506,6 @@ a.skip:active {
     width: 14em;
 }
 
-.groupselector {
-    margin-top: 3px;
-    margin-bottom: 3px;
-    display: inline-block;
-}
-
-.groupselector label {
-    display: inline-block;
-}
-
 // Notes
 .notepost {
     margin-bottom: 1em;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 416729a6cf6..f5a0e2cc952 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -26088,16 +26088,6 @@ a.skip:active {
   width: 14em;
 }
 
-.groupselector {
-  margin-top: 3px;
-  margin-bottom: 3px;
-  display: inline-block;
-}
-
-.groupselector label {
-  display: inline-block;
-}
-
 .notepost {
   margin-bottom: 1em;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 9d1660eb787..395c90bdb7e 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -26088,16 +26088,6 @@ a.skip:active {
   width: 14em;
 }
 
-.groupselector {
-  margin-top: 3px;
-  margin-bottom: 3px;
-  display: inline-block;
-}
-
-.groupselector label {
-  display: inline-block;
-}
-
 .notepost {
   margin-bottom: 1em;
 }