diff --git a/mod/folder/edit.php b/mod/folder/edit.php
index 666e3fe080c..1d40e4bde55 100644
--- a/mod/folder/edit.php
+++ b/mod/folder/edit.php
@@ -45,7 +45,8 @@ $PAGE->set_activity_record($folder);
 
 $data = new stdClass();
 $data->id = $cm->id;
-$options = array('subdirs'=>1, 'maxbytes'=>$CFG->maxbytes, 'maxfiles'=>-1, 'accepted_types'=>'*');
+$maxbytes = get_user_max_upload_file_size($context, $CFG->maxbytes);
+$options = array('subdirs' => 1, 'maxbytes' => $maxbytes, 'maxfiles' => -1, 'accepted_types' => '*');
 file_prepare_standard_filemanager($data, 'files', $options, $context, 'mod_folder', 'content', 0);
 
 $mform = new mod_folder_edit_form(null, array('data'=>$data, 'options'=>$options));