diff --git a/git_cl.py b/git_cl.py
index 8fa7dd98b..505a3e87b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2830,7 +2830,7 @@ class ChangeDescription(object):
   CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
   STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
   BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
-  COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
+  COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
   BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
 
   def __init__(self, description, bug=None, fixed=None):
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index d73dd8764..9ed8a1fca 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1694,6 +1694,8 @@ class TestGitCl(TestCase):
       ('Revert "Reland: [a] feature"', ['a']),
       ('Foo: feature', ['foo']),
       ('Foo Bar: feature', ['foo-bar']),
+      ('Change Foo::Bar', []),
+      ('Foo: Change Foo::Bar', ['foo']),
       ('Revert "Foo bar: feature"', ['foo-bar']),
       ('Reland "Foo bar: feature"', ['foo-bar']),
     ]