diff --git a/files/assets/js/comments+submission_listing.js b/files/assets/js/comments+submission_listing.js
index ceb576621..6e1e211f6 100644
--- a/files/assets/js/comments+submission_listing.js
+++ b/files/assets/js/comments+submission_listing.js
@@ -33,30 +33,28 @@ function popovertrigger() {
 popovertrigger()
 
 function popclick(author) {
-    let badges = ''
-    for (const x of author["badges"]) {
-        badges += `<img width="32" loading="lazy" src="${x}">`
-    }
-    i = document.getElementsByClassName('pop-banner').length - 1
-    document.getElementsByClassName('pop-banner')[i].src = author["bannerurl"]
-    document.getElementsByClassName('pop-picture')[i].src = author["profile_url"]
-    document.getElementsByClassName('pop-username')[i].innerHTML = author["username"]
-    document.getElementsByClassName('pop-bio')[i].innerHTML = author["bio_html"]
-    document.getElementsByClassName('pop-postcount')[i].innerHTML = author["post_count"]
-    document.getElementsByClassName('pop-commentcount')[i].innerHTML = author["comment_count"]
-    document.getElementsByClassName('pop-coins')[i].innerHTML = author["coins"]
-    document.getElementsByClassName('pop-viewmore')[i].href = author["url"]
-    document.getElementsByClassName('pop-badges')[i].innerHTML = badges
-
     let popfix = document.getElementById("popover-fix")
     if (popfix) document.body.removeChild(popfix);
 
     var popover_old = document.getElementsByClassName("popover")[0];
     var popover_new = document.createElement("DIV");
-  
     popover_new.innerHTML = popover_old.outerHTML;
     popover_new.id = "popover-fix";
   
+    let badges = ''
+    for (const x of author["badges"]) {
+        badges += `<img width="32" loading="lazy" src="${x}">`
+    }
+    popover_new.getElementsByClassName('pop-banner')[0].src = author["bannerurl"]
+    popover_new.getElementsByClassName('pop-picture')[0].src = author["profile_url"]
+    popover_new.getElementsByClassName('pop-username')[0].innerHTML = author["username"]
+    popover_new.getElementsByClassName('pop-bio')[0].innerHTML = author["bio_html"]
+    popover_new.getElementsByClassName('pop-postcount')[0].innerHTML = author["post_count"]
+    popover_new.getElementsByClassName('pop-commentcount')[0].innerHTML = author["comment_count"]
+    popover_new.getElementsByClassName('pop-coins')[0].innerHTML = author["coins"]
+    popover_new.getElementsByClassName('pop-viewmore')[0].href = author["url"]
+    popover_new.getElementsByClassName('pop-badges')[0].innerHTML = badges
+  
     document.body.appendChild(popover_new);
     document.body.removeChild(popover_old);
 }