diff --git a/files/index.php b/files/index.php
index fb1cdaa9289..2e3a2dcaea9 100644
--- a/files/index.php
+++ b/files/index.php
@@ -647,6 +647,8 @@ function displaydir ($wdir) {
     $straction = get_string("action");
     $strmakeafolder = get_string("makeafolder");
     $struploadafile = get_string("uploadafile");
+    $strselectall = get_string("selectall");
+    $strselectnone = get_string("deselectall");
     $strwithchosenfiles = get_string("withchosenfiles");
     $strmovetoanotherfolder = get_string("movetoanotherfolder");
     $strmovefilestohere = get_string("movefilestohere");
@@ -819,6 +821,10 @@ function displaydir ($wdir) {
         echo " <input type=\"submit\" value=\"$strmakeafolder\" />";
         echo "</form>";
     echo "</td>";
+    echo "<td align=\"right\">";
+        echo " <input type=\"button\" value=\"$strselectall\" onClick=\"checkall();\" />";
+        echo " <input type=\"button\" value=\"$strselectnone\" onClick=\"uncheckall();\" />";
+    echo "</td>";
     echo "<td align=\"right\">";
         echo "<form action=\"index.php\" method=\"get\">";
         echo ' <input type="hidden" name="choose" value="'.$choose.'">';
diff --git a/lib/javascript.php b/lib/javascript.php
index ceafa522e75..932e43e4959 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -40,6 +40,13 @@ function uncheckall() {
     void(el[i].checked=0)
 }
 
+function checkall() {
+  void(d=document);
+  void(el=d.getElementsByTagName('INPUT'));
+  for(i=0;i<el.length;i++)
+    void(el[i].checked=1)
+}
+
 function inserttext(text) {
 <?php
     if (!empty($SESSION->inserttextform)) {