diff --git a/4chan_x.user.js b/4chan_x.user.js
index b10c37f0d..2159cb45e 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1264,7 +1264,7 @@
     },
     captchaKeydown: function(e) {
       var blank;
-      if (e.keyCode !== 13) {
+      if (!(e.keyCode === 13 && this.value)) {
         return;
       }
       blank = !$('textarea', qr.el).value && !$('input[type=file]', qr.el).files.length;
diff --git a/script.coffee b/script.coffee
index efe1ecb59..1edc6b2fa 100644
--- a/script.coffee
+++ b/script.coffee
@@ -997,7 +997,7 @@ qr =
     $('#recaptcha_challenge_field', qr.el).value = target.value
 
   captchaKeydown: (e) ->
-    return unless e.keyCode is 13 #enter
+    return unless e.keyCode is 13 and @value #enter
 
     blank = !$('textarea', qr.el).value and !$('input[type=file]', qr.el).files.length
     return unless blank or cooldown.duration