diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e7bcdaf4..133df7f9d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ### v1.10.12
 
+**v1.10.12.5** *(2015-05-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.5/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix bug where submit button was still getting unwanted focus under certain conditions.
+
 **v1.10.12.4** *(2015-05-10)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.4/builds/4chan-X-noupdate.crx "Chromium version")]
 - Improve reporting to archive functionality.
 
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index d6c128b97..8d0070f6a 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 63be1bc76..b2feb8ee3 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.10.12.4
+// @version      1.10.12.5
 // @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 e1c51f23f..2b416f984 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.10.12.4
+// @version      1.10.12.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -396,7 +396,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.12.4',
+    VERSION: '1.10.12.5',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -8272,15 +8272,17 @@
       });
       $.set('captchas', this.captchas);
       this.count();
+      focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
       if (this.needed()) {
-        if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
-          this.shouldFocus = true;
-        } else {
-          QR.nodes.status.focus();
+        if (focus) {
+          if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
+            this.shouldFocus = true;
+          } else {
+            QR.nodes.status.focus();
+          }
         }
         this.reload();
       } else {
-        focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
         if (pasted) {
           this.destroy();
         } else {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 3a4bd904b..ed8cec875 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 b9507b1ac..7cab505b5 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.10.12.4
+// @version      1.10.12.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -395,7 +395,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.12.4',
+    VERSION: '1.10.12.5',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -8271,15 +8271,17 @@
       });
       $.set('captchas', this.captchas);
       this.count();
+      focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
       if (this.needed()) {
-        if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
-          this.shouldFocus = true;
-        } else {
-          QR.nodes.status.focus();
+        if (focus) {
+          if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
+            this.shouldFocus = true;
+          } else {
+            QR.nodes.status.focus();
+          }
         }
         this.reload();
       } else {
-        focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
         if (pasted) {
           this.destroy();
         } else {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 3c0f12189..7eb6fdacf 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 22b31ed22..c74936aa5 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.12.4
+// @version      1.10.12.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 751713ece..0a77ca1cc 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.10.12.4
+// @version      1.10.12.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -396,7 +396,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.12.4',
+    VERSION: '1.10.12.5',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -8272,15 +8272,17 @@
       });
       $.set('captchas', this.captchas);
       this.count();
+      focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
       if (this.needed()) {
-        if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
-          this.shouldFocus = true;
-        } else {
-          QR.nodes.status.focus();
+        if (focus) {
+          if (QR.cooldown.auto || Conf['Post on Captcha Completion']) {
+            this.shouldFocus = true;
+          } else {
+            QR.nodes.status.focus();
+          }
         }
         this.reload();
       } else {
-        focus = ((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && ((ref1 = d.activeElement.src) != null ? ref1.slice(0, 38) : void 0) === 'https://www.google.com/recaptcha/api2/';
         if (pasted) {
           this.destroy();
         } else {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index bfbd632c7..e324ce2b1 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 ec46bf482..c27234af2 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://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.12.4' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.12.5' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 76378e826..55153a6d7 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://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.12.4' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.12.5' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 74e64dee0..ee9744c42 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.10.12.4",
-    "date": "2015-05-11T06:20:12.938Z",
+    "version": "1.10.12.5",
+    "date": "2015-05-14T08:03:11.268Z",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",