diff --git a/templates/2k11/config.inc.php b/templates/2k11/config.inc.php
index daa368b4..44cc5fd9 100644
--- a/templates/2k11/config.inc.php
+++ b/templates/2k11/config.inc.php
@@ -22,6 +22,7 @@ if (class_exists('serendipity_event_spamblock')) {
 } elseif (class_exists('serendipity_event_commentspice')) {
     $required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%commentspice%required_fields'", true, 'assoc');
 }
+
 if (is_array($required_fieldlist)) {
     $required_fields = explode(',', $required_fieldlist['value']);
     $smarty_required_fields = array();
@@ -36,6 +37,8 @@ if (is_array($required_fieldlist)) {
     $serendipity['smarty']->assign('required_fields', $smarty_required_fields);
 }
 
+$serendipity['smarty']->assign('is_templatechooser', $_SESSION['serendipityUseTemplate']);
+
 $template_config = array(
     array(
         'var' => 'date_format',
@@ -133,3 +136,7 @@ function serendipity_plugin_api_pre_event_hook($event, &$bag, &$eventData, &$add
         break;
     }
 }
+
+if ($_SESSION['serendipityUseTemplate']) {
+    $template_loaded_config['use_corenav'] = false;
+}