diff --git a/js/favorites.js b/js/favorites.js
index daf7b732..027dc243 100644
--- a/js/favorites.js
+++ b/js/favorites.js
@@ -50,7 +50,7 @@ function add_favorites() {
 	$('.boardlist').append(boards);
 };
 
-if (active_page == 'thread' || active_page == 'index') {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko') {
 	$(document).ready(function(){
 		var favorites = JSON.parse(localStorage.favorites);
 		var is_board_favorite = ~$.inArray(board_name, favorites);
diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index c31a6e74..0796193b 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -41,7 +41,7 @@ watchlist.render = function(reset) {
 	} else {
 		//If the watchlist has not yet been rendered, create it.
 		var menuStyle = getComputedStyle($('.boardlist')[0]);
-		$('form[name="post"]').before(
+		$((active_page == 'ukko') ? 'hr:first' : (active_page == 'catalog') ? 'body>span:first' : 'form[name="post"]').before(
 			$('<div id="watchlist">'+
 					'<div class="watchlist-controls">'+
 						'<span><a id="clearList">['+_('Clear List')+']</a></span>&nbsp'+
@@ -60,6 +60,8 @@ watchlist.render = function(reset) {
 watchlist.add = function(sel) {
 	var threadName, threadInfo;
 
+	var board_name = $(sel).parents('.thread').data('board');
+
 	if (active_page === 'thread') {
 		if ($('.subject').length){
 			//If a subject is given, use the first 20 characters as the thread name.
@@ -70,7 +72,7 @@ watchlist.add = function(sel) {
 		//board name, thread name as defined above, current amount of posts, thread url
 		threadInfo = [board_name, threadName, $('.post').length, location.href];
 
-	} else if (active_page === 'index') {
+	} else if (active_page === 'index' || active_page === 'ukko') {
 
 		var postCount;
 		//Figure out the post count.
@@ -142,7 +144,7 @@ watchlist.exists = function(sel) {
 };
 
 $(document).ready(function(){
-	if (!(active_page == 'thread' || active_page == 'index')) {
+	if (!(active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko')) {
 		return;
 	}