diff --git a/4chan_x.coffee b/4chan_x.coffee
index 388b340f1..bad13fc57 100644
--- a/4chan_x.coffee
+++ b/4chan_x.coffee
@@ -200,6 +200,7 @@ autoWatch = ->
 closeQR = ->
     div = this.parentNode.parentNode
     remove div
+    keyActAdd()
 
 clearHidden = ->
     #'hidden' might be misleading; it's the number of IDs we're *looking* for,
@@ -274,10 +275,11 @@ expandThread = ->
 
 formSubmit = (e) ->
     if span = @nextSibling
-        remove(span)
+        remove span
     recaptcha = $('input[name=recaptcha_response_field]', this)
     if recaptcha.value
         $('#qr input[title=autohide]:not(:checked)')?.click()
+        keyActAdd()
     else
         e.preventDefault()
         span = n 'span',
@@ -343,6 +345,7 @@ iframeLoad = ->
             className: 'error'
         addTo qr, span
         $('input[title=autohide]:checked', qr)?.click()
+        keyActRem()
     else if g.REPLY and getConfig 'Persistent QR'
         $('textarea', qr).value = ''
         $('input[name=recaptcha_response_field]', qr).value = ''
@@ -424,7 +427,8 @@ keyAct = (e) ->
     g.count = 0
 
 keyActAdd = ->
-    d.addEventListener 'keydown', keyAct, true
+    if not g.REPLY and getConfig 'Keyboard Actions'
+        d.addEventListener 'keydown', keyAct, true
 
 keyActRem = ->
     d.removeEventListener 'keydown', keyAct, true
diff --git a/4chan_x.js b/4chan_x.js
index efcf003f1..5f5ed764f 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -263,7 +263,8 @@
   closeQR = function() {
     var div;
     div = this.parentNode.parentNode;
-    return remove(div);
+    remove(div);
+    return keyActAdd();
   };
   clearHidden = function() {
     GM_deleteValue("hiddenReplies/" + (g.BOARD) + "/");
@@ -347,7 +348,8 @@
     }
     recaptcha = $('input[name=recaptcha_response_field]', this);
     if (recaptcha.value) {
-      return (typeof (_ref2 = ((_ref = $('#qr input[title=autohide]:not(:checked)')))) === "undefined" || _ref2 === null) ? undefined : _ref2.click();
+      (typeof (_ref2 = ((_ref = $('#qr input[title=autohide]:not(:checked)')))) === "undefined" || _ref2 === null) ? undefined : _ref2.click();
+      return keyActAdd();
     } else {
       e.preventDefault();
       span = n('span', {
@@ -427,6 +429,7 @@
       });
       addTo(qr, span);
       (typeof (_ref2 = ((_ref = $('input[title=autohide]:checked', qr)))) === "undefined" || _ref2 === null) ? undefined : _ref2.click();
+      keyActRem();
     } else if (g.REPLY && getConfig('Persistent QR')) {
       $('textarea', qr).value = '';
       $('input[name=recaptcha_response_field]', qr).value = '';
@@ -534,7 +537,7 @@
     return (g.count = 0);
   };
   keyActAdd = function() {
-    return d.addEventListener('keydown', keyAct, true);
+    return !g.REPLY && getConfig('Keyboard Actions') ? d.addEventListener('keydown', keyAct, true) : null;
   };
   keyActRem = function() {
     return d.removeEventListener('keydown', keyAct, true);