diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 145556a..629100d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
diff --git a/includes/advanced_forum_preprocess_forum_list.inc b/includes/advanced_forum_preprocess_forum_list.inc
index 2b0415d..22d8bb0 100644
--- a/includes/advanced_forum_preprocess_forum_list.inc
+++ b/includes/advanced_forum_preprocess_forum_list.inc
@@ -8,13 +8,21 @@
 function _advanced_forum_preprocess_forum_list(&$variables) {
   advanced_forum_add_template_suggestions("forum_list", $variables);
 
+  // Added variable for default collapsed configuration
+  $variables['collapsed_main_list'] = variable_get('advanced_forum_default_collapsed_list', array());
+
   // Add needed items for the collapsible containers.
   $collapsible = variable_get('advanced_forum_collapsible_containers', 'toggle');
   $variables['collapsible'] = FALSE;
   if ($collapsible != 'none') {
     drupal_add_library('system', 'jquery.cookie');
     drupal_add_js(drupal_get_path('module', 'advanced_forum') . '/js/advanced_forum.js');
-    $settings['advanced_forum'] = array('modulePath' => drupal_get_path('module', 'advanced_forum'), 'effect' => $collapsible);
+    $settings['advanced_forum'] = array(
+      'modulePath' => drupal_get_path('module', 'advanced_forum'),
+      'effect' => $collapsible,
+      'default_collapsed_list' => $variables['collapsed_main_list'],
+    );
+
     drupal_add_js($settings, array('type' => 'setting'));
     $variables['collapsible'] = TRUE;
   }
diff --git a/includes/settings.inc b/includes/settings.inc
index a2ea57d..01af708 100644
--- a/includes/settings.inc
+++ b/includes/settings.inc
@@ -103,7 +103,7 @@
     '#description' => t('Check this to disable breadcrumbs in the forum if you are using another module to customize them. Does not affect node pages and does not work when Page Manager is overriding forum pages.'),
   );
 
-  $form['advanced_forum_general']['advanced_forum_collapsible_containers'] = array(
+  $form['advanced_forum_lists']['advanced_forum_collapsible_containers'] = array(
     '#type' => 'select',
     '#title' => t('Collapsible forum containers'),
     '#options' => array(
@@ -116,6 +116,21 @@
     '#default_value' => variable_get('advanced_forum_collapsible_containers', 'toggle'),
   );
 
+  // For default collapsed state configuration
+  $collapsed_list_name = variable_get('forum_containers', array());
+  $collapsed_list_description = array();
+  foreach ($collapsed_list_name as $id) {
+    $collapsed_list_description[$id] = taxonomy_term_load($id)->name;
+  }
+  $form['advanced_forum_lists']['advanced_forum_default_collapsed_list'] = array(
+    '#type' => 'select',
+    '#title' => t('Containers collapsed by default'),
+    '#default_value' => variable_get('advanced_forum_default_collapsed_list', array()),
+    '#options' => $collapsed_list_description,
+    '#multiple' => TRUE,
+    '#description' => t('Select containers which should be collapsed by default.'),
+  );
+
   if (module_exists('image')) {
 
     /* Forum image settings */
diff --git a/js/advanced_forum.js b/js/advanced_forum.js
index 8f9781b..852f903 100644
--- a/js/advanced_forum.js
+++ b/js/advanced_forum.js
@@ -18,8 +18,15 @@
 
       // Get data for current page
       Drupal.advanced_forum.collapsed_current = Drupal.advanced_forum.collapsed_page[encodeURIComponent(window.location.pathname)];
-      if (!Drupal.advanced_forum.collapsed_current)
+
+      if (!Drupal.advanced_forum.collapsed_current) {
         Drupal.advanced_forum.collapsed_current = new Array();
+        // For intial load default collapsed state settings needs to checked in init function.
+        Drupal.advanced_forum.initial_load = 1;
+      }
+      else {
+        Drupal.advanced_forum.initial_load = 0;
+      }
 
       var handleElement = $('.forum-collapsible', context);
 
@@ -72,26 +79,39 @@
     // get forum id
     var id = $(this).attr('id').split('-')[2];
 
-    // Check if item is collapsed
-    if ($.inArray(id, Drupal.advanced_forum.collapsed_current) > -1) {
-      $(this)
-        .addClass('container-collapsed')
-        .parent().addClass('container-collapsed');
-      Drupal.advanced_forum.collapse(id, 'toggle');
-      return;
+    // On initial load, deal with default collapsed state of containers.
+    if(Drupal.advanced_forum.initial_load) {
+      var list = 0;
+      for(list in Drupal.settings.advanced_forum.default_collapsed_list) {
+        if (id == list) {
+          Drupal.advanced_forum.collapse(id, 'toggle');
+          break;
+        }
+      }
+    }
+    else {
+      // Check if item is collapsed
+      if ($.inArray(id, Drupal.advanced_forum.collapsed_current) > -1) {
+        $(this)
+          .addClass('container-collapsed')
+          .parent().addClass('container-collapsed');
+        Drupal.advanced_forum.collapse(id, 'toggle');
+      }
+      else {
+        $(this)
+          .removeClass('container-collapsed')
+          .parent().removeClass('container-collapsed');
+        Drupal.advanced_forum.expand(id, 'toggle');
+      }
     }
 
-    $(this)
-      .removeClass('container-collapsed')
-      .parent().removeClass('container-collapsed');
-    Drupal.advanced_forum.expand(id, 'toggle');
   };
 
   Drupal.advanced_forum.collapse = function(id, effect) {
     switch(effect) {
       case 'fade':
-         $('#forum-table-' + id).fadeOut('fast');
-         break;
+        $('#forum-table-' + id).fadeOut('fast');
+        break;
       case 'slide':
         $('#forum-table-' + id).slideUp('fast');
         break;
@@ -106,8 +126,8 @@
   Drupal.advanced_forum.expand = function(id, effect) {
     switch(effect) {
       case 'fade':
-         $('#forum-table-' + id).fadeIn('fast');
-         break;
+        $('#forum-table-' + id).fadeIn('fast');
+        break;
       case 'slide':
         $('#forum-table-' + id).slideDown('fast');
         break;