diff --git a/course/format/singleactivity/styles.css b/course/format/singleactivity/styles.css
index 65f7875..b6e35ef 100644
--- a/course/format/singleactivity/styles.css
+++ b/course/format/singleactivity/styles.css
@@ -1,8 +1,6 @@
-/* Hide confusing form elements "Display description on course page" and
-"Save and return to course" from module edit form because they
-are not applicable in single activity course format */
-body.format-singleactivity.path-mod.pagelayout-admin form.mform #fitem_id_showdescription,
-body.format-singleactivity.path-mod.pagelayout-admin form.mform .fitem_actionbuttons#fgroup_id_buttonar #id_submitbutton {display:none;}
+/* Hide confusing form element "Display description on course page" from module edit form
+because it is not applicable in single activity course format */
+body.format-singleactivity.path-mod.pagelayout-admin form.mform #fitem_id_showdescription {display:none;}
 
 /* In mod_quiz hide "Back to course" button */
 body.format-singleactivity.path-mod-quiz .quizattempt .continuebutton {display:none;}
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 8a7aa14..de3cd80 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -844,12 +844,13 @@ abstract class moodleform_mod extends moodleform {
      * @return void
      */
     function add_action_buttons($cancel=true, $submitlabel=null, $submit2label=null) {
+        global $COURSE;
         if (is_null($submitlabel)) {
             $submitlabel = get_string('savechangesanddisplay');
         }
 
         if (is_null($submit2label)) {
-            $submit2label = get_string('savechangesandreturntocourse');
+            $submit2label = $COURSE->format == 'singleactivity' ? false : get_string('savechangesandreturntocourse');
         }
 
         $mform = $this->_form;