diff --git a/4chan_x.user.js b/4chan_x.user.js
index dcee79f44..4e0d951a7 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1200,7 +1200,7 @@
       });
       if (conf['Persistent QR']) {
         qr.dialog();
-        return $.id('autohide').click();
+        if (conf['Auto Hide QR']) return $.id('autohide').click();
       }
     },
     open: function() {
@@ -1215,7 +1215,11 @@
       }
     },
     hide: function() {
-      return qr.el.lastChild.hidden = this.checked;
+      if (this.checked) {
+        return $.addClass(qr.el, 'autohide');
+      } else {
+        return $.removeClass(qr.el, 'autohide');
+      }
     },
     close: function() {
       return qr.el.hidden = true;
@@ -1241,6 +1245,9 @@
       var input, _i, _len, _ref;
       qr.el = ui.dialog('qr', 'top:0;right:0;', '\
 <style>\
+.autohide:not(:hover) > div:not(.move) {\
+  display: none;\
+}\
 #qr > .move {\
   min-width: 300px;\
   text-align: right;\
diff --git a/script.coffee b/script.coffee
index 9d09aa362..7ff99bb05 100644
--- a/script.coffee
+++ b/script.coffee
@@ -872,7 +872,7 @@ qr =
       $.on $('.quotejs + .quotejs', root), 'click', qr.quote
     if conf['Persistent QR']
       qr.dialog()
-      $.id('autohide').click()
+      $.id('autohide').click() if conf['Auto Hide QR']
 
   open: ->
     if qr.el
@@ -884,7 +884,10 @@ qr =
       qr.dialog()
 
   hide: ->
-    qr.el.lastChild.hidden = this.checked
+    if this.checked
+      $.addClass qr.el, 'autohide'
+    else
+      $.removeClass qr.el, 'autohide'
 
   close: ->
     qr.el.hidden = true
@@ -912,6 +915,9 @@ qr =
   dialog: ->
     qr.el = ui.dialog 'qr', 'top:0;right:0;', '
 <style>
+.autohide:not(:hover) > div:not(.move) {
+  display: none;
+}
 #qr > .move {
   min-width: 300px;
   text-align: right;