diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index f6ef14fa0..6346b0c0a 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -133,7 +133,6 @@
 	  <var:foreach list="additionalJSFiles" item="item"
 	    ><script type="text/javascript" var:src="item"><!-- space --></script>
 	  </var:foreach>
-	  <script type="text/javascript">FastInit.addOnLoad(onFinalLoadHandler);</script>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES"
 	  ><var:component className="SOGoBrowsersPanel"
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 933e2229f..113fd0e0d 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1425,6 +1425,8 @@ function onLoadHandler(event) {
   if (progressImage)
     progressImage.parentNode.removeChild(progressImage);
   $(document.body).observe("contextmenu", onBodyClickContextMenu);
+
+	FastInit.addOnLoad(onFinalLoadHandler);
 }
 
 function onBodyClickContextMenu(event) {
@@ -1519,8 +1521,6 @@ function onFinalLoadHandler(event) {
     safetyNet.parentNode.removeChild(safetyNet);
 }
 
-FastInit.addOnLoad(onLoadHandler);
-
 function parent$(element) {
   return this.opener.document.getElementById(element);
 }
@@ -1538,3 +1538,5 @@ function getMenus() {
 function onHeaderClick(event) {
   window.alert("generic headerClick");
 }
+
+FastInit.addOnLoad(onLoadHandler);