diff --git a/src/Posting/Captcha.v1.coffee b/src/Posting/Captcha.v1.coffee
index 904b0f5d0..c371bef7e 100644
--- a/src/Posting/Captcha.v1.coffee
+++ b/src/Posting/Captcha.v1.coffee
@@ -95,7 +95,7 @@ Captcha.v1 =
   setup: (focus, force) ->
     return unless @isEnabled and (force or @needed())
     @create()
-    @nodes.input.focus() if focus
+    @nodes.input.focus() if focus and d.activeElement in [QR.nodes.status, d.body]
 
   afterSetup: ->
     return unless challenge = $.id 'recaptcha_challenge_field_holder'
diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index 70c486bf6..ddb7de804 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -73,7 +73,7 @@ Captcha.v2 =
 
   setup: (focus, force) ->
     return unless @isEnabled and (@needed() or force)
-    @nodes.counter.focus() if focus and not QR.inBubble()
+    @nodes.counter.focus() if focus and d.activeElement in [QR.nodes.status, d.body]
     if @timeouts.destroy
       clearTimeout @timeouts.destroy
       delete @timeouts.destroy
@@ -213,7 +213,7 @@ Captcha.v2 =
     @captchas = @captchas[i..]
     @count()
     $.set 'captchas', @captchas
-    @setup(d.activeElement is QR.nodes.status)
+    @setup true
 
   count: ->
     @nodes.counter.textContent = "Captchas: #{@captchas.length}"
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index a707e3499..f26bc5e93 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -773,7 +773,7 @@ QR =
           QR.cooldown.addMute seconds
         else
           QR.cooldown.addDelay post, seconds
-        QR.captcha.setup (d.activeElement is QR.nodes.status)
+        QR.captcha.setup true
       else # stop auto-posting
         QR.cooldown.auto = false
       QR.status()
@@ -815,7 +815,7 @@ QR =
       QR.close()
     else
       post.rm()
-      QR.captcha.setup(d.activeElement is QR.nodes.status)
+      QR.captcha.setup true
 
     QR.cooldown.add threadID, postID