diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index e6d06faad6..9a58bfeb84 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -325,11 +325,9 @@ public class I2PSnarkServlet extends BasicServlet {
                           "<script src=\"" + jsPfx + "/js/ajax.js\" type=\"text/javascript\"></script>\n" +
                           "<script type=\"text/javascript\">\n"  +
                           "var failMessage = \"<div class=\\\"routerdown\\\"><b>" + downMsg + "<\\/b><\\/div>\";\n" +
-                          "function requestAjax1() { ajax(\"" + _contextPath + "/.ajax/xhr1.html" +
-                          peerString.replace("&amp;", "&") +  // don't html escape in js
-                          "\", \"mainsection\", " + (delay*1000) + "); }\n" +
-                          "function initAjax() { setTimeout(requestAjax1, " + (delay*1000) +");  }\n"  +
-                          "</script>\n");
+                          "var ajaxDelay = " + (delay * 1000) + ";\n" +
+                          "</script>\n" +
+                          "<script src=\".resources/js/initajax.js\" type=\"text/javascript\"></script>\n");
             }
         }
         out.write(HEADER_A + _themePath + HEADER_B);
@@ -338,13 +336,9 @@ public class I2PSnarkServlet extends BasicServlet {
         if (noCollapse || !collapsePanels) {
             out.write(HEADER_A + _themePath + HEADER_C);
         }
-        out.write("</head>\n");
-
-        if (isConfigure || delay <= 0)
-            out.write("<body>");
-        else
-            out.write("<body onload=\"initAjax()\">");
-        out.write("<center>");
+        out.write("</head>\n" +
+                  "<body>" +
+                  "<center>");
         List<Tracker> sortedTrackers = null;
         if (isConfigure) {
             out.write("<div class=\"snarknavbar\"><a href=\"" + _contextPath + "/\" title=\"");
@@ -3072,10 +3066,8 @@ public class I2PSnarkServlet extends BasicServlet {
                    "<link rel=\"shortcut icon\" href=\"" + _themePath + "favicon.ico\">\n");
         if (showPriority)
             buf.append("<script src=\"").append(_contextPath).append(WARBASE + "js/folder.js\" type=\"text/javascript\"></script>\n");
-        buf.append("</head><body");
-        if (showPriority)
-            buf.append(" onload=\"setupbuttons()\"");
-        buf.append(">\n<center><div class=\"snarknavbar\"><a href=\"").append(_contextPath).append("/\" title=\"Torrents\"" +
+        buf.append("</head><body>\n" +
+                   "<center><div class=\"snarknavbar\"><a href=\"").append(_contextPath).append("/\" title=\"Torrents\"" +
                    " class=\"snarkNav nav_main\">");
         if (_contextName.equals(DEFAULT_NAME))
             buf.append(_t("I2PSnark"));
diff --git a/apps/i2psnark/resources/js/folder.js b/apps/i2psnark/resources/js/folder.js
index 90d7a68f84..e5bec44ade 100644
--- a/apps/i2psnark/resources/js/folder.js
+++ b/apps/i2psnark/resources/js/folder.js
@@ -61,3 +61,7 @@ const setallskip=()=>{
 	form.savepri.disabled = false;
 	form.savepri.className = 'accept';
 }
+
+document.addEventListener("DOMContentLoaded", function() {
+    setupbuttons();
+}, true);
diff --git a/apps/i2psnark/resources/js/initajax.js b/apps/i2psnark/resources/js/initajax.js
new file mode 100644
index 0000000000..fa8782412a
--- /dev/null
+++ b/apps/i2psnark/resources/js/initajax.js
@@ -0,0 +1,15 @@
+function requestAjax1() {
+    var url = ".ajax/xhr1.html";
+    var query = window.location.search;
+    if (query)
+        url += query;
+    ajax(url, "mainsection", ajaxDelay);
+}
+
+function initAjax() {
+    setTimeout(requestAjax1, ajaxDelay);
+}
+
+document.addEventListener("DOMContentLoaded", function() {
+   initAjax();
+}, true);
