diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 6a229f88b..9e6bd9a4a 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -241,10 +241,10 @@ def sanitize(sanitized, noimages=False):
 	for rd in ["https://reddit.com/", "https://new.reddit.com/", "https://www.reddit.com/", "https://redd.it/"]:
 		sanitized = sanitized.replace(rd, "https://old.reddit.com/")
 
-	for i in re.finditer('[^">](https:\/\/.*?)( |\<)', sanitized):
-		sanitized = sanitized.replace(i.group(1), f"<a href={i.group(1)} target='_blank'>{i.group(1)}</a>")
+	for i in re.finditer('[^">](https:\/\/[^ <>]*)', sanitized):
+		sanitized = sanitized.replace(i.group(1), f"<a href={i.group(1)} {i.group(1)}</a>")
 
-	# for i in re.finditer('\<p\>(https:\/\/[^ ]*)', sanitized):
-	# 	sanitized = sanitized.replace(i.group(1), f"<a href={i.group(1)} target='_blank'>{i.group(1)}</a>")
+	for i in re.finditer('<p>(https:\/\/[^ <>]*)', sanitized):
+		sanitized = sanitized.replace(i.group(1), f"<a href={i.group(1)} {i.group(1)}</a>")
 
 	return sanitized