diff --git a/src/Posting/Captcha.fixes.coffee b/src/Posting/Captcha.fixes.coffee
index 36e52577e..4fe7adec6 100644
--- a/src/Posting/Captcha.fixes.coffee
+++ b/src/Posting/Captcha.fixes.coffee
@@ -51,12 +51,17 @@ Captcha.fixes =
   initMain: ->
     $.onExists d.body, '#recaptcha-anchor', (checkbox) ->
       focus = ->
-        if d.hasFocus() and d.activeElement isnt checkbox
+        if d.hasFocus() and d.activeElement in [d.documentElement, d.body]
           checkbox.focus()
       focus()
       $.on window, 'focus', ->
         $.queueTask focus
 
+    # Remove Privacy and Terms links from tab order.
+    for a in $$ '.rc-anchor-pt a'
+      a.tabIndex = -1
+    return
+
   initPopup: ->
     $.addStyle @css
     @fixImages()