diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 656e85e73e3..ca6ff79be61 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4332,10 +4332,12 @@ class assign {
      * @return string
      */
     protected function view_remove_submission_confirm() {
-        global $USER;
+        global $USER, $PAGE;
 
         $userid = optional_param('userid', $USER->id, PARAM_INT);
 
+        $PAGE->set_pagelayout('standard');
+
         if (!$this->can_edit_submission($userid, $USER->id)) {
             throw new \moodle_exception('nopermission');
         }
@@ -5226,10 +5228,12 @@ class assign {
      * @return string
      */
     protected function check_submit_for_grading($mform) {
-        global $USER, $CFG;
+        global $USER, $CFG, $PAGE;
 
         require_once($CFG->dirroot . '/mod/assign/submissionconfirmform.php');
 
+        $PAGE->set_pagelayout('standard');
+
         // Check that all of the submission plugins are ready for this submission.
         // Also check whether there is something to be submitted as well against atleast one.
         $notifications = array();