diff --git a/4chan_x.user.js b/4chan_x.user.js
index 89be4eb77..7fd552837 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1722,7 +1722,7 @@
       container = $.el('span', {
         className: 'container'
       });
-      $.before($('br, blockquote', root), container);
+      $.after($('span[id^=no]', root), container);
       id = root.id || $('td[id]', root).id;
       quotes = {};
       tid = g.THREAD_ID || root.parentNode.firstChild.id;
@@ -2449,9 +2449,6 @@
       if (form && $.config('Quick Reply')) {
         qr.init();
       }
-      if ($.config('Report Button')) {
-        reportButton.init();
-      }
       if ($.config('Quote Backlinks')) {
         quoteBacklink.init();
       }
@@ -2464,6 +2461,9 @@
       if ($.config('Indicate OP quote')) {
         quoteOP.init();
       }
+      if ($.config('Report Button')) {
+        reportButton.init();
+      }
       if ($.config('Thread Watcher')) {
         watcher.init();
       }
diff --git a/script.coffee b/script.coffee
index 64c860f7e..d290d0e6b 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1387,7 +1387,7 @@ quoteBacklink =
     return if /inline/.test root.className
     container = $.el 'span',
       className: 'container'
-    $.before $('br, blockquote', root), container
+    $.after $('span[id^=no]', root), container
     id = root.id or $('td[id]', root).id
     quotes = {}
     tid = g.THREAD_ID or root.parentNode.firstChild.id
@@ -1879,9 +1879,6 @@ main =
     if form and $.config 'Quick Reply'
       qr.init()
 
-    if $.config 'Report Button'
-      reportButton.init()
-
     if $.config 'Quote Backlinks'
       quoteBacklink.init()
 
@@ -1894,6 +1891,9 @@ main =
     if $.config 'Indicate OP quote'
       quoteOP.init()
 
+    if $.config 'Report Button'
+      reportButton.init()
+
     if $.config 'Thread Watcher'
       watcher.init()