diff --git a/public/course/edit_form.php b/public/course/edit_form.php
index 433b4a5abee..ba100c40393 100644
--- a/public/course/edit_form.php
+++ b/public/course/edit_form.php
@@ -447,6 +447,7 @@ class course_edit_form extends moodleform {
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
         $mform->closeHeaderBefore('buttonar');
+        $mform->set_sticky_footer('buttonar');
 
         $mform->addElement('hidden', 'id', null);
         $mform->setType('id', PARAM_INT);
diff --git a/public/course/moodleform_mod.php b/public/course/moodleform_mod.php
index 76356b99692..351d5fc3155 100644
--- a/public/course/moodleform_mod.php
+++ b/public/course/moodleform_mod.php
@@ -1118,6 +1118,7 @@ abstract class moodleform_mod extends moodleform {
 
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
         $mform->setType('buttonar', PARAM_RAW);
+        $mform->set_sticky_footer('buttonar');
     }
 
     /**
diff --git a/public/theme/boost/scss/moodle/sticky-footer.scss b/public/theme/boost/scss/moodle/sticky-footer.scss
index 4b4b1dea25d..97bbf1b2444 100644
--- a/public/theme/boost/scss/moodle/sticky-footer.scss
+++ b/public/theme/boost/scss/moodle/sticky-footer.scss
@@ -47,6 +47,12 @@ body {
             }
         }
     }
+    fieldset div {
+        justify-content: flex-end;
+    }
+    [data-groupname="buttonar"] {
+        width: 100%;
+    }
 }
 
 .hasstickyfooter .stickyfooter {
diff --git a/public/theme/boost/style/moodle.css b/public/theme/boost/style/moodle.css
index 452a0e5f0cc..572f871f833 100644
--- a/public/theme/boost/style/moodle.css
+++ b/public/theme/boost/style/moodle.css
@@ -38559,6 +38559,12 @@ body {
     padding: 0 1rem;
   }
 }
+.stickyfooter fieldset div {
+  justify-content: flex-end;
+}
+.stickyfooter [data-groupname=buttonar] {
+  width: 100%;
+}
 
 .hasstickyfooter .stickyfooter {
   bottom: 0;
diff --git a/public/theme/classic/style/moodle.css b/public/theme/classic/style/moodle.css
index 80de42a0435..d45d5631bef 100644
--- a/public/theme/classic/style/moodle.css
+++ b/public/theme/classic/style/moodle.css
@@ -38493,6 +38493,12 @@ body {
     padding: 0 1rem;
   }
 }
+.stickyfooter fieldset div {
+  justify-content: flex-end;
+}
+.stickyfooter [data-groupname=buttonar] {
+  width: 100%;
+}
 
 .hasstickyfooter .stickyfooter {
   bottom: 0;