diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 578e5e064..88ff066ec 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1943,8 +1943,9 @@ function createButton(id, caption, action) {
         var span = createElement("span", null, null, null, null, newButton);
         span.appendChild(document.createTextNode(caption));
     }
-    if (action)
-        newButton.on("click", action);
+    if (action) {
+        newButton.on("click", clickEventWrapper(action));
+    }
 
     return newButton;
 }