diff --git a/lib/form/choosecoursefile.php b/lib/form/choosecoursefile.php
index 95660a83164..ebcd4d1cfea 100644
--- a/lib/form/choosecoursefile.php
+++ b/lib/form/choosecoursefile.php
@@ -96,7 +96,8 @@ class MoodleQuickForm_choosecoursefile extends MoodleQuickForm_group
             $options = $this->_options['options'];
         }
         $action = new popup_action('click', $url, $button->getName(), $options);
-        $OUTPUT->add_action_handler($action, $button->id);
+        
+        $button->updateAttributes(array('id'=>$OUTPUT->add_action_handler($action, $button->getAttribute('id'))));
     }
 
     /**