diff --git a/inc/config.php b/inc/config.php
index 21f7b5cc..a3087162 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -931,8 +931,8 @@
 	// Show page navigation links at the top as well.
 	$config['page_nav_top'] = false;
 
-	// Show "Catalog" link in page navigation. Use with the Catalog theme.
-	// $config['catalog_link'] = 'catalog.html';
+	// Show "Catalog" link in page navigation. Use with the Catalog theme. Set to false to disable.
+	$config['catalog_link'] = 'catalog.html';
 
 	// Board categories. Only used in the "Categories" theme.
 	// $config['categories'] = array(
diff --git a/templates/thread.html b/templates/thread.html
index 2d4ae262..3ddb5b1f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -62,7 +62,9 @@
 			<span id="thread-links">
 				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
 				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
-				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+                		{% if config.catalog_link %}
+					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+		                {% endif %}
 			</span>
 			
 			<span id="thread-quick-reply">