diff --git a/src/templates/default-js.js b/src/templates/default-js.js
index 49f4d21..2fa9a53 100644
--- a/src/templates/default-js.js
+++ b/src/templates/default-js.js
@@ -22,7 +22,17 @@ function _default_js_main() {
 
 function _default_js_onclick(event) {
     event.preventDefault();
-    let url = event.target.href;
+
+    let node = event.target;
+    while (node.nodeName != "A") {
+        if (node.parentNode == null) {
+            return;
+        }
+        node = node.parentNode;
+    }
+    let url = node.href;
+
+
     _default_js_open_page(url, true);
 }
 
@@ -49,7 +59,9 @@ function change_page(new_document, new_url, no_pop_state) {
 
     // Some meta tags
     document.title = new_document.title;
-    let new_favicon = new_document.querySelector("link[rel*='icon']").href;
+
+    let new_favicon = "";
+    new_favicon = new_document.querySelector("link[rel*='icon']").href;
 
     document.querySelector("link[rel*='icon']").href = new_favicon;
 
@@ -79,4 +91,4 @@ function change_page(new_document, new_url, no_pop_state) {
         window.history.pushState(new_url, new_url, new_url);
     }
 
-}
\ No newline at end of file
+}