diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index 200dca1c27a..b3eed114653 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -628,6 +628,7 @@ M.form_filemanager.init = function(Y, options) {
                 viewmode : this.viewmode,
                 appendonly : appendfiles != null,
                 filenode : element_template,
+                disablecheckboxes : false,
                 callbackcontext : this,
                 callback : function(e, node) {
                     if (e.preventDefault) { e.preventDefault(); }
diff --git a/repository/filepicker.js b/repository/filepicker.js
index cf4555c892f..57616f18de0 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -341,9 +341,6 @@ YUI.add('moodle-core_filepicker', function(Y) {
         /** initialize table view */
         var initialize_table_view = function() {
             var cols = [
-                {key: "", label: "<input type='checkbox' id='select-all'/>",
-                    allowHTML: true, formatter: formatCheckbox,
-                    sortable: false},
                 {key: "displayname", label: M.util.get_string('name', 'moodle'), allowHTML: true, formatter: formatTitle,
                     sortable: true, sortFn: sortFoldersFirst},
                 {key: "datemodified", label: M.util.get_string('lastmodified', 'moodle'), allowHTML: true, formatter: formatValue,
@@ -353,6 +350,15 @@ YUI.add('moodle-core_filepicker', function(Y) {
                 {key: "mimetype", label: M.util.get_string('type', 'repository'), allowHTML: true,
                     sortable: true, sortFn: sortFoldersFirst}
             ];
+
+            // Enable the selectable checkboxes
+            if (options.disablecheckboxes != undefined && !options.disablecheckboxes) {
+                cols.unshift({
+                    key: "", label: "<input type='checkbox' id='select-all'/>",
+                    allowHTML: true, formatter: formatCheckbox,
+                    sortable: false
+                });
+            }
             scope.tableview = new Y.DataTable({columns: cols, data: fileslist});
             scope.tableview.delegate('click', function (e, tableview) {
                 var record = tableview.getRecord(e.currentTarget.get('id'));