diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 332ba2e68..062d044c2 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -593,7 +593,6 @@ QR =
     $.forceSync 'cooldowns'
     if QR.cooldown.seconds
       QR.cooldown.auto = !QR.cooldown.auto
-      QR.captcha.setup true if QR.cooldown.auto
       QR.status()
       return
 
@@ -636,7 +635,6 @@ QR =
       return
 
     # Enable auto-posting if we have stuff to post, disable it otherwise.
-    wasAuto = QR.cooldown.auto
     QR.cooldown.auto = QR.posts.length > 1
 
     post.lock()
@@ -696,9 +694,6 @@ QR =
     # Provide some feedback that we're starting to submit.
     QR.status()
 
-    # Focus on captcha if more captchas are needed.
-    QR.captcha.setup true unless wasAuto
-
   response: ->
     {req} = QR
     delete QR.req
@@ -769,6 +764,7 @@ QR =
 
     if postsCount
       post.rm()
+      QR.captcha.setup(d.activeElement is QR.nodes.status)
     else if Conf['Persistent QR']
       post.rm()
       if Conf['Auto Hide QR']