diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6b6a4c89b..9fa8d87ea 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -815,7 +815,6 @@
 {% include "expanded_image_modal.html" %}
 
 <script>
-	window.addEventListener("load",function(event) {
 		function poll_vote(cid, parentid) {
 			{% if v %}
 				for(let el of document.getElementsByClassName('presult-'+parentid)) {
@@ -837,6 +836,7 @@
 			{% endif %}
 		}
 
+	window.addEventListener("load",function(event) {
 		const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
 
 		const popoverList = popoverTriggerList.map(function(popoverTriggerEl) {
diff --git a/files/templates/submission.html b/files/templates/submission.html
index b1f793b39..e79c39309 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -875,25 +875,23 @@
 
 {% if not p.comment_count %}
 	<script>
-		window.addEventListener("load",function(event) {
-			function poll_vote(cid) {
-				{% if v %}
-					for(let el of document.getElementsByClassName('presult')) {
-						el.classList.remove('d-none');
-					}
-					var type = document.getElementById(cid).checked;
-					var scoretext = document.getElementById('poll-' + cid);
-					var score = Number(scoretext.textContent);
-					if (type == true) scoretext.textContent = score + 1;
-					else scoretext.textContent = score - 1;
-					post('/vote/poll/' + cid + '?vote=' + type);
-				{% else %}
-					var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
-					myToast.show();
-					document.getElementById('toast-post-error-text').innerText = "Only logged-in users can vote!";
-				{% endif %}
-			}
-		});
+		function poll_vote(cid) {
+			{% if v %}
+				for(let el of document.getElementsByClassName('presult')) {
+					el.classList.remove('d-none');
+				}
+				var type = document.getElementById(cid).checked;
+				var scoretext = document.getElementById('poll-' + cid);
+				var score = Number(scoretext.textContent);
+				if (type == true) scoretext.textContent = score + 1;
+				else scoretext.textContent = score - 1;
+				post('/vote/poll/' + cid + '?vote=' + type);
+			{% else %}
+				var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
+				myToast.show();
+				document.getElementById('toast-post-error-text').innerText = "Only logged-in users can vote!";
+			{% endif %}
+		}
 	</script>
 
 	{% if v %}