diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php
index 07e0b412491..daa9fed20d3 100644
--- a/grade/import/xml/grade_import_form.php
+++ b/grade/import/xml/grade_import_form.php
@@ -90,7 +90,7 @@ class grade_import_form extends moodleform {
             $mform->disabledIf('key', 'url', 'eq', '');
         }
 
-        $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
+        $this->add_sticky_action_buttons(false, get_string('uploadgrades', 'grades'));
     }
 
     function validation($data, $files) {
diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 765b9281ce6..c6ee91a1eef 100644
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -18,8 +18,8 @@
 require_once('../../../config.php');
 require_once($CFG->libdir . '/gradelib.php');
 require_once($CFG->dirroot . '/grade/lib.php');
-require_once($CFG->dirroot . '/grade/import/grade_import_form.php');
-require_once($CFG->dirroot . '/grade/import/lib.php');
+require_once($CFG->dirroot . '/grade/import/xml/lib.php');
+require_once($CFG->dirroot . '/grade/import/xml/grade_import_form.php');
 
 $id = required_param('id', PARAM_INT); // course id