diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 186f3f472fc..928c1febc88 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -338,6 +338,13 @@ fieldset.coursesearchbox label {
     font-size: large;
 }
 
+select.form-control {
+    &[size],
+    &[multiple] {
+        padding-right: 0;
+    }
+}
+
 /* Non-bootstrap selects with a size show their contents outside of the element.
  * Remove when we update to stable bootstrap 4. (MDL-56511) */
 select[size],
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 7534280b6a2..b6cd992c4a2 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -16616,6 +16616,9 @@ fieldset.coursesearchbox label {
   padding: 0.5em;
   font-size: large; }
 
+select.form-control[size], select.form-control[multiple] {
+  padding-right: 0; }
+
 /* Non-bootstrap selects with a size show their contents outside of the element.
  * Remove when we update to stable bootstrap 4. (MDL-56511) */
 select[size],
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 130af1911b8..aba6377b368 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -16842,6 +16842,9 @@ fieldset.coursesearchbox label {
   padding: 0.5em;
   font-size: large; }
 
+select.form-control[size], select.form-control[multiple] {
+  padding-right: 0; }
+
 /* Non-bootstrap selects with a size show their contents outside of the element.
  * Remove when we update to stable bootstrap 4. (MDL-56511) */
 select[size],