diff --git a/modules/tinyurl.py b/modules/tinyurl.py
index 8ef5e04..731737a 100644
--- a/modules/tinyurl.py
+++ b/modules/tinyurl.py
@@ -68,7 +68,7 @@ def parselisten(msg):
 def parseresponse(msg):
     global LAST_URLS
     try:
-        urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ ]+)", msg.text)
+        urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ :]+)", msg.text)
         for url in urls:
             o = urlparse(url)
             if o.scheme != "":
diff --git a/modules/youtube-title.py b/modules/youtube-title.py
index c7bbd9f..93240b0 100644
--- a/modules/youtube-title.py
+++ b/modules/youtube-title.py
@@ -83,7 +83,7 @@ def parselisten(msg):
 def parseresponse(msg):
     global LAST_URLS
     if hasattr(msg, "text"):
-      urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ ]+)", msg.text)
+      urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ :]+)", msg.text)
       for url in urls:
         o = urlparse(url)
         if o.scheme != "":