diff --git a/files/templates/home.html b/files/templates/home.html
index 98d7c32cc..6d91eb974 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -210,7 +210,7 @@
 	<script>
 		if (!("standalone" in window.navigator) && !(window.navigator.standalone)) {
 			if (window.innerWidth <= 737) {
-				window.addEventListener('DOMContentLoaded', function() {
+				document.addEventListener('DOMContentLoaded', function() {
 					const tt = bootstrap.Tooltip.getOrCreateInstance(document.getElementById('mobile-prompt'))
 					tt.show()
 					document.getElementsByClassName('tooltip')[0].onclick = function(event){
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 2d8e98bd2..3ccfa766f 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -1126,19 +1126,18 @@
 <script>
 	(() => {
 		{% if not v or v.highlightcomments %}
-			window.addEventListener('DOMContentLoaded', function() {
+			document.addEventListener('DOMContentLoaded', function() {
 				showNewCommentCounts('{{p.id}}', {{p.comment_count}})
+				{% if "?context" not in request.full_path %}
+					localStorage.setItem("old-comment-counts", localStorage.getItem("comment-counts"))
+
+					const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
+					const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || {c: 0}).c + 1)
+					comments['{{p.id}}'] = {c: newTotal, t: Date.now()}
+					localStorage.setItem("comment-counts", JSON.stringify(comments))
+				{% endif %}
 			})
 		{% endif %}
-
-		{% if "?context" not in request.full_path %}
-			localStorage.setItem("old-comment-counts", localStorage.getItem("comment-counts"))
-
-			const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
-			const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || {c: 0}).c + 1)
-			comments['{{p.id}}'] = {c: newTotal, t: Date.now()}
-			localStorage.setItem("comment-counts", JSON.stringify(comments))
-		{% endif %}
 	})()
 </script>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 451f893c6..50e18369b 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -306,7 +306,7 @@
 
 <script>
 	{% if not v or v.highlightcomments %}
-		window.addEventListener('DOMContentLoaded', function() {
+		document.addEventListener('DOMContentLoaded', function() {
 			showNewCommentCounts({{p.id}}, {{p.comment_count}})
 		})
 	{% endif %}