diff --git a/4chan_x.user.js b/4chan_x.user.js
index c8fa69a00..31745ff97 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1708,10 +1708,12 @@
     submit: function(e) {
       var captcha, challenge, el, id, input, op, qr, response;
       qr = QR.qr;
-      if ($('form button', qr).disabled) {
-        return;
-      }
-      if (!($('textarea', qr).value || $('#files', qr).childNodes.length)) {
+      if ($('textarea', qr).value || $('#files', qr).childNodes.length) {
+        if ($('form button', qr).disabled) {
+          $('#autopost', qr).checked = true;
+          return;
+        }
+      } else {
         if (e) {
           alert('Error: No text entered.');
           e.preventDefault();
diff --git a/script.coffee b/script.coffee
index 2d6340813..c4cf12bf3 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1265,9 +1265,12 @@ QR =
     $('textarea', QR.qr).value = ''
   submit: (e) ->
     {qr} = QR
-    return if $('form button', qr).disabled
     #XXX e is undefined if method is called explicitly, eg, from auto posting
-    unless $('textarea', qr).value or $('#files', qr).childNodes.length
+    if $('textarea', qr).value or $('#files', qr).childNodes.length
+      if $('form button', qr).disabled
+        $('#autopost', qr).checked = true
+        return
+    else
       if e
         alert 'Error: No text entered.'
         e.preventDefault()