Index: bp-themes/bp-default/groups/single/forum/topic.php
===================================================================
--- bp-themes/bp-default/groups/single/forum/topic.php	(revision 3612)
+++ 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> &nbsp; <?php if ( !bp_forum_directory_is_disabled() ) : ?><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-themes/bp-default/functions.php
===================================================================
--- bp-themes/bp-default/functions.php	(revision 3612)
+++ bp-themes/bp-default/functions.php	(working copy)
@@ -478,13 +478,27 @@
  * @since 1.3
  */
 function bp_dtheme_main_nav( $args ) {
+	global $bp;
+
+	$pages_args = array(
+		'title_li' => '',
+		'depth' => '0',
+		'exclude' => bp_dtheme_page_on_front()
+	);
+	
+	if ( bp_forum_directory_is_disabled() ) {
+		if ( !empty( $pages_args['exclude'] ) )
+			$pages_args['exclude'] .= ',';
+		$pages_args['exclude'] .= $bp->pages->forums->id;
+	}
+	
 ?>
 	<ul id="nav">
 		<li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
 			<a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
 		</li>
 
-		<?php wp_list_pages( 'title_li=&depth=0&exclude=' . bp_dtheme_page_on_front() ); ?>
+		<?php wp_list_pages( $pages_args ) ?>
 		<?php do_action( 'bp_nav_items' ); ?>
 	</ul><!-- #nav -->
 <?php
Index: bp-forums/bp-forums-templatetags.php
===================================================================
--- bp-forums/bp-forums-templatetags.php	(revision 3612)
+++ bp-forums/bp-forums-templatetags.php	(working copy)
@@ -1062,6 +1062,15 @@
 		return apply_filters( 'bp_get_forum_directory_permalink', $bp->root_domain . '/' . $bp->forums->slug );
 	}
 
+function bp_forum_directory_is_disabled() { 
+	global $bp; 
+	
+	if ( !empty( $bp->site_options['bp-disable-forum-directory'] ) ) 
+		return true; 
+	
+	return false; 
+}
+
 function bp_forums_tag_heat_map( $args = '' ) {
 	$defaults = array(
 		'smallest' => '10',