diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index 56f7dc2ac9d..c0a24e0853b 100644
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -152,6 +152,8 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $html .= $OUTPUT->file_manager($options);
 
         $html .= '<input value="'.$draftitemid.'" name="'.$elname.'" type="hidden" />';
+        // label element needs 'for' attribute work
+        $html .= '<input value="" id="id_'.$elname.'" type="hidden" />';
 
         return $html;
     }
diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
index bed14ea8d9a..cc15acac99f 100644
--- a/lib/form/filepicker.php
+++ b/lib/form/filepicker.php
@@ -82,6 +82,8 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
         $options = $fp->options;
         $str .= $OUTPUT->render($fp);
         $str .= '<input type="hidden" name="'.$elname.'" id="'.$id.'" value="'.$draftitemid.'" />';
+        // label element needs 'for' attribute work
+        $html .= '<input value="" id="id_'.$elname.'" type="hidden" />';
         return $str;
     }