diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index bc68711bcf0..79ee69b3a89 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -2018,7 +2018,7 @@ class global_navigation extends navigation_node {
 
         $context = get_context_instance(CONTEXT_USER, $USER->id);
         if ($iscurrentuser && has_capability('moodle/user:manageownfiles', $context)) {
-            $url = new moodle_url('/user/files.php');
+            $url = new moodle_url('/user/filesedit.php');
             $usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING);
         }
 
diff --git a/user/filesedit.php b/user/filesedit.php
index 716456e569b..2438f73002e 100644
--- a/user/filesedit.php
+++ b/user/filesedit.php
@@ -33,13 +33,11 @@ if (isguestuser()) {
 }
 
 $returnurl = optional_param('returnurl', '', PARAM_URL);
+$returnbutton = true;
 
 if (empty($returnurl)) {
-    if (!empty($_SERVER["HTTP_REFERER"])) {
-        $returnurl = $_SERVER["HTTP_REFERER"];
-    } else {
-        $returnurl = new moodle_url('/user/files.php');
-    }
+    $returnbutton = false;
+    $returnurl = new moodle_url('/user/filesedit.php');
 }
 
 $context = get_context_instance(CONTEXT_USER, $USER->id);
@@ -60,7 +58,7 @@ $data->returnurl = $returnurl;
 $options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
 file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0);
 
-$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options));
+$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton));
 
 if ($mform->is_cancelled()) {
     redirect($returnurl);
diff --git a/user/filesedit_form.php b/user/filesedit_form.php
index 4fd1e6f1b5e..13cc0418c3e 100644
--- a/user/filesedit_form.php
+++ b/user/filesedit_form.php
@@ -31,13 +31,14 @@ class user_filesedit_form extends moodleform {
     function definition() {
         $mform = $this->_form;
 
-        $data    = $this->_customdata['data'];
-        $options = $this->_customdata['options'];
+        $data           = $this->_customdata['data'];
+        $options        = $this->_customdata['options'];
+        $cancelbutton   = isset($this->_customdata['cancelbutton']) ? $this->_customdata['cancelbutton'] : true;
 
         $mform->addElement('filemanager', 'files_filemanager', get_string('files'), null, $options);
         $mform->addElement('hidden', 'returnurl', $data->returnurl);
 
-        $this->add_action_buttons(true, get_string('savechanges'));
+        $this->add_action_buttons($cancelbutton, get_string('savechanges'));
 
         $this->set_data($data);
     }