diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index 0311e2693..2acc7e169 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -266,6 +266,9 @@ function bs_trigger(e) {
 			i.addEventListener('keydown', speed_carot_navigate, false);
 		});
 	}
+
+	if (typeof link_trigger === "function")
+		link_trigger(e);
 }
 
 var bsTriggerOnReady = function() {
diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html
index 67d20b0e4..754b1b902 100644
--- a/files/templates/util/html_head.html
+++ b/files/templates/util/html_head.html
@@ -11,6 +11,19 @@
 {% macro javascript() %}
 	<script defer src="{{'js/vendor/bootstrap.js' | asset}}"></script>
 	<script defer src="{{'js/core.js' | asset}}"></script>
+
+	<script>
+		if (window.matchMedia('(display-mode: standalone)')['matches']) { // if PWA
+			function link_trigger(e) {
+				const links = e.querySelectorAll('a[target="_blank"]'); // get links with target="_blank"
+				for (const link of links) { // loop on them
+					link.removeAttribute("target");
+				}
+			}
+
+			document.addEventListener('DOMContentLoaded', link_trigger(document));
+		}
+	</script>
 {% endmacro %}
 
 {% macro page_meta(title=none) %}