diff --git a/src/ui/window_list.c b/src/ui/window_list.c
index 4898f7a5..ab598f81 100644
--- a/src/ui/window_list.c
+++ b/src/ui/window_list.c
@@ -1310,7 +1310,8 @@ wins_add_urls_ac(const ProfWin* const win, const ProfMessage* const message, con
     GRegex* regex;
     GMatchInfo* match_info;
 
-    regex = g_regex_new("(https?|aesgcm)://\\S+", 0, 0, NULL);
+    // https://stackoverflow.com/questions/43588699/regex-for-matching-any-url-character
+    regex = g_regex_new("(https?|aesgcm)://[\\w\\-.~:/?#\\[\\]@!$&'()*+,;=%]+", 0, 0, NULL);
     g_regex_match(regex, message->plain, 0, &match_info);
 
     while (g_match_info_matches(match_info)) {