diff --git a/ChangeLog b/ChangeLog
index c60525150..9490319da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/generic.js (clickEventWrapper): pass the
+	value of "this" to the invoked callback.
+
 2012-04-24  Ludovic Marcotte  <lmarcotte@inverse.ca> 
 
 	* SOPE/GDLContentStore/GCSFolder.m (-writeContent:toName:baseVersion:):
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index fea5c0ddc..d1d57330c 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -50,7 +50,7 @@ var emailRE = /^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-
 function clickEventWrapper(functionRef) {
     function button_clickEventWrapper(event) {
         preventDefault(event);
-        return functionRef(event);
+        return functionRef.apply(this, [event]);
     }
 
     return button_clickEventWrapper;