diff --git a/course/edit.php b/course/edit.php
index 717ba91bfc7..c0040d29945 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -9,7 +9,7 @@
     $id         = optional_param('id', 0, PARAM_INT);       // course id
     $categoryid = optional_param('category', 0, PARAM_INT); // course category - can be changed in edit form
 
-    $PAGE->set_pagelayout('base');
+    $PAGE->set_pagelayout('admin');
 
 /// basic access control checks
     if ($id) { // editing course
diff --git a/course/edit_form.php b/course/edit_form.php
index a833a7260eb..3c6f0e0fe8b 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -171,9 +171,12 @@ class course_edit_form extends moodleform {
         $mform->setDefault('maxbytes', $courseconfig->maxbytes);
 
         if (!empty($CFG->allowcoursethemes)) {
+            $themeobjects = get_list_of_themes();
             $themes=array();
             $themes[''] = get_string('forceno');
-            $themes += get_list_of_themes();
+            foreach ($themeobjects as $key=>$theme) {
+                $themes[$key] = $theme->name;
+            }
             $mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
         }