diff --git a/git_cl.py b/git_cl.py
index f99f5e99a2..bad7c57ac8 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2545,8 +2545,10 @@ def SendUpstream(parser, args, cmd):
   commit_desc = ChangeDescription(change_desc.description)
   if cl.GetIssue():
     # Xcode won't linkify this URL unless there is a non-whitespace character
-    # after it. Add a period on a new line to circumvent this.
-    commit_desc.append_footer('Review URL: %s.' % cl.GetIssueURL())
+    # after it. Add a period on a new line to circumvent this. Also add a space
+    # before the period to make sure that Gitiles continues to correctly resolve
+    # the URL.
+    commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
   if options.contributor:
     commit_desc.append_footer('Patch from %s.' % options.contributor)
 
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 293523daa0..220e591643 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -360,7 +360,7 @@ class TestGitCl(TestCase):
       ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
       ((['git', 'commit', '-m',
          'Issue: 12345\n\nR=john@chromium.org\n\n'
-         'Review URL: https://codereview.example.com/12345.'],),
+         'Review URL: https://codereview.example.com/12345 .'],),
        ''),
       ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
       ((['git',