diff --git a/js/favorites.js b/js/favorites.js
index 4a5bb54c..39bae783 100644
--- a/js/favorites.js
+++ b/js/favorites.js
@@ -34,11 +34,13 @@ function handle_boards(data) {
 	data = JSON.parse(data);
 
 	$.each(data, function(k, v) {
-		boards.push('<a href="/'+v+'">'+v+'</a>');
+		boards.push('<a href="/'+v+(window.active_page === 'catalog' ? '/catalog.html' : '')+'">'+v+'</a>');
 	})
 
 	if (boards[0]) {
 		return $('<span class="favorite-boards"></span>').append(' [ '+boards.join(" / ")+' ] ');
+	} else {
+		return $('<span class="favorite-boards"></span>');
 	}	
 }
 
@@ -50,7 +52,7 @@ function add_favorites() {
 	$('.boardlist').append(boards);
 };
 
-if (active_page == 'thread' || active_page == 'index') {
+if (active_page == 'thread' || active_page == 'index' || active_page == 'catalog') {
 	$(document).ready(function(){
 		var favorites = JSON.parse(localStorage.favorites);
 		var is_board_favorite = ~$.inArray(board_name, favorites);
diff --git a/js/update_boards.js b/js/update_boards.js
index 9e77fbf8..5186615a 100644
--- a/js/update_boards.js
+++ b/js/update_boards.js
@@ -4,12 +4,12 @@ window.boards = new Array();
 function handle_boards(data) {
 	$.each(data, function(k, v) {
 		if (v.uri != 'meta' && v.uri != 'b' && v.uri != 'int') {
-			boards.push('<a href="/'+v.uri+'">'+v.uri+'</a>');
+			boards.push('<a href="/'+v.uri+(window.active_page === 'catalog' ? '/catalog.html' : '')+'">'+v.uri+'</a>');
 		}
 	})
 
 	if (boards[0]) {
-		$('.favorite-boards').before('<span class="sub" data-description="3"> [ '+boards.slice(0,15).join(" / ")+' ] </span>');
+		$('.sub[data-description="2"]').after('<span class="sub" data-description="3"> [ '+boards.slice(0,15).join(" / ")+' ] </span>');
 	}
 	
 }