diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45a7a1437..00fa5c6b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.18
 
+**v1.11.18.4** *(2015-11-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.4/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.17.10: Fix captcha focusing bug.
+
 **v1.11.18.3** *(2015-11-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.3/builds/4chan-X-noupdate.crx "Chromium version")]
 - Merge v1.11.17.9: Support solving 4x4 image captchas with keys in 7-0-/-M square.
 
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index dd4490f90..21c77c51d 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 2d8422c92..0a0d21417 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.18.3
+// @version      1.11.18.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 5cd96e02f..238a303f0 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.18.3
+// @version      1.11.18.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -432,7 +432,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.18.3',
+    VERSION: '1.11.18.4',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7810,7 +7810,7 @@
       return QR.status();
     },
     response: function() {
-      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, req, resDoc, seconds, threadID;
+      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, req, resDoc, seconds, threadID;
       req = QR.req;
       delete QR.req;
       post = QR.posts[0];
@@ -7853,7 +7853,7 @@
         } else {
           QR.cooldown.auto = false;
         }
-        QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
+        QR.captcha.setup(QR.cooldown.auto && ((ref1 = d.activeElement) === QR.nodes.status || ref1 === d.body));
         if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
           QR.cooldown.auto = false;
         }
@@ -7866,12 +7866,12 @@
       if (Conf['Posting Success Notifications']) {
         QR.notifications.push(new Notice('success', h1.textContent, 5));
       }
-      ref1 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref1[0], threadID = ref1[1], postID = ref1[2];
+      ref2 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref2[0], threadID = ref2[1], postID = ref2[2];
       postID = +postID;
       threadID = +threadID || postID;
       isReply = threadID !== postID;
-      if ((ref2 = QR.db) != null) {
-        ref2.set({
+      if ((ref3 = QR.db) != null) {
+        ref3.set({
           boardID: g.BOARD.ID,
           threadID: threadID,
           postID: postID,
@@ -7891,10 +7891,10 @@
       postsCount = QR.posts.length - 1;
       QR.cooldown.auto = postsCount && isReply;
       lastPostToThread = !((function() {
-        var k, len1, p, ref3;
-        ref3 = QR.posts.slice(1);
-        for (k = 0, len1 = ref3.length; k < len1; k++) {
-          p = ref3[k];
+        var k, len1, p, ref4;
+        ref4 = QR.posts.slice(1);
+        for (k = 0, len1 = ref4.length; k < len1; k++) {
+          p = ref4[k];
           if (p.thread === post.thread) {
             return true;
           }
@@ -8378,6 +8378,7 @@
       }
       this.create();
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         return this.nodes.input.focus();
       }
     },
@@ -8654,6 +8655,7 @@
         return;
       }
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         this.nodes.counter.focus();
       }
       if (this.timeouts.destroy) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 35114ec47..ccd323110 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index bba860379..c142bb87b 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.18.3
+// @version      1.11.18.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -432,7 +432,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.18.3',
+    VERSION: '1.11.18.4',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7810,7 +7810,7 @@
       return QR.status();
     },
     response: function() {
-      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, req, resDoc, seconds, threadID;
+      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, req, resDoc, seconds, threadID;
       req = QR.req;
       delete QR.req;
       post = QR.posts[0];
@@ -7853,7 +7853,7 @@
         } else {
           QR.cooldown.auto = false;
         }
-        QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
+        QR.captcha.setup(QR.cooldown.auto && ((ref1 = d.activeElement) === QR.nodes.status || ref1 === d.body));
         if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
           QR.cooldown.auto = false;
         }
@@ -7866,12 +7866,12 @@
       if (Conf['Posting Success Notifications']) {
         QR.notifications.push(new Notice('success', h1.textContent, 5));
       }
-      ref1 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref1[0], threadID = ref1[1], postID = ref1[2];
+      ref2 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref2[0], threadID = ref2[1], postID = ref2[2];
       postID = +postID;
       threadID = +threadID || postID;
       isReply = threadID !== postID;
-      if ((ref2 = QR.db) != null) {
-        ref2.set({
+      if ((ref3 = QR.db) != null) {
+        ref3.set({
           boardID: g.BOARD.ID,
           threadID: threadID,
           postID: postID,
@@ -7891,10 +7891,10 @@
       postsCount = QR.posts.length - 1;
       QR.cooldown.auto = postsCount && isReply;
       lastPostToThread = !((function() {
-        var k, len1, p, ref3;
-        ref3 = QR.posts.slice(1);
-        for (k = 0, len1 = ref3.length; k < len1; k++) {
-          p = ref3[k];
+        var k, len1, p, ref4;
+        ref4 = QR.posts.slice(1);
+        for (k = 0, len1 = ref4.length; k < len1; k++) {
+          p = ref4[k];
           if (p.thread === post.thread) {
             return true;
           }
@@ -8378,6 +8378,7 @@
       }
       this.create();
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         return this.nodes.input.focus();
       }
     },
@@ -8654,6 +8655,7 @@
         return;
       }
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         this.nodes.counter.focus();
       }
       if (this.timeouts.destroy) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 6f1f4600e..598fe7505 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 5e57fe102..b84e70eae 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.18.3
+// @version      1.11.18.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 653362317..b09646f85 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.18.3
+// @version      1.11.18.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -432,7 +432,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.18.3',
+    VERSION: '1.11.18.4',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7810,7 +7810,7 @@
       return QR.status();
     },
     response: function() {
-      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, req, resDoc, seconds, threadID;
+      var URL, _, ban, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, req, resDoc, seconds, threadID;
       req = QR.req;
       delete QR.req;
       post = QR.posts[0];
@@ -7853,7 +7853,7 @@
         } else {
           QR.cooldown.auto = false;
         }
-        QR.captcha.setup(QR.cooldown.auto && d.activeElement === QR.nodes.status);
+        QR.captcha.setup(QR.cooldown.auto && ((ref1 = d.activeElement) === QR.nodes.status || ref1 === d.body));
         if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
           QR.cooldown.auto = false;
         }
@@ -7866,12 +7866,12 @@
       if (Conf['Posting Success Notifications']) {
         QR.notifications.push(new Notice('success', h1.textContent, 5));
       }
-      ref1 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref1[0], threadID = ref1[1], postID = ref1[2];
+      ref2 = h1.nextSibling.textContent.match(/thread:(\d+),no:(\d+)/), _ = ref2[0], threadID = ref2[1], postID = ref2[2];
       postID = +postID;
       threadID = +threadID || postID;
       isReply = threadID !== postID;
-      if ((ref2 = QR.db) != null) {
-        ref2.set({
+      if ((ref3 = QR.db) != null) {
+        ref3.set({
           boardID: g.BOARD.ID,
           threadID: threadID,
           postID: postID,
@@ -7891,10 +7891,10 @@
       postsCount = QR.posts.length - 1;
       QR.cooldown.auto = postsCount && isReply;
       lastPostToThread = !((function() {
-        var k, len1, p, ref3;
-        ref3 = QR.posts.slice(1);
-        for (k = 0, len1 = ref3.length; k < len1; k++) {
-          p = ref3[k];
+        var k, len1, p, ref4;
+        ref4 = QR.posts.slice(1);
+        for (k = 0, len1 = ref4.length; k < len1; k++) {
+          p = ref4[k];
           if (p.thread === post.thread) {
             return true;
           }
@@ -8378,6 +8378,7 @@
       }
       this.create();
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         return this.nodes.input.focus();
       }
     },
@@ -8654,6 +8655,7 @@
         return;
       }
       if (focus) {
+        $.addClass(QR.nodes.el, 'focus');
         this.nodes.counter.focus();
       }
       if (this.timeouts.destroy) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 590f96a23..6e299fbe4 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index cceb74949..efadf338b 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.18.3' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.18.4' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 5463b50b3..391091d39 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.18.3' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.18.4' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 25a1b9600..124a8af18 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.11.18.3",
-  "date": "2015-11-25T06:04:54.566Z"
+  "version": "1.11.18.4",
+  "date": "2015-11-26T03:16:11.946Z"
 }