diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index d32cf803..9703e477 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -25,7 +25,7 @@ $(document).ready(function(){
 			else
 				return;
 		
-			$post = $('#reply_' + id);
+			$post = $('#reply_' + id + ', #op_' + id);
 			if($post.length == 0)
 				return;
 		
@@ -46,9 +46,9 @@ $(document).ready(function(){
 		});
 	};
 	
-	$('div.post.reply').each(showBackLinks);
+	$('div.post').each(showBackLinks);
 
-        $(document).on('new_post', function(e, post) {
+    $(document).on('new_post', function(e, post) {
 		if ($(post).hasClass("reply")) {
 			showBackLinks.call(post);
 		}
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 70f1c160..40b40d23 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -152,7 +152,7 @@ $(document).ready(function(){
 	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
 	$('.compact-boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
 	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
+	$('.op>.intro>a:last').after('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();