Index: bp-themes/bp-default/groups/single/forum/topic.php
===================================================================
--- bp-themes/bp-default/groups/single/forum/topic.php	(revision 3138)
+++ bp-themes/bp-default/groups/single/forum/topic.php	(working copy)
@@ -18,7 +18,7 @@
 
 		<div id="topic-meta">
 			<h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
-			<a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a>
+			<a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a><?php if ( !bp_forum_directory_is_disabled() ) : ?> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a><?php endif; ?>
 
 			<div class="admin-links">
 				<?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
Index: bp-forums/bp-forums-templatetags.php
===================================================================
--- bp-forums/bp-forums-templatetags.php	(revision 3138)
+++ bp-forums/bp-forums-templatetags.php	(working copy)
@@ -1042,6 +1042,15 @@
 		return apply_filters( 'bp_get_forum_directory_permalink', $bp->root_domain . '/' . $bp->forums->slug );
 	}
 
+function bp_forum_directory_is_disabled() {
+	global $bp;
+
+	if ( (int) $bp->site_options['bp-disable-forum-directory'] )
+		return true;
+
+	return false;
+}
+
 function bp_forums_tag_heat_map( $args = '' ) {
 	$defaults = array(
 		'smallest' => '10',