diff --git a/collapsiblock.module b/collapsiblock.module
index d15e0c4..eab28f6 100644
--- a/collapsiblock.module
+++ b/collapsiblock.module
@@ -161,12 +161,13 @@ function collapsiblock_form_alter(&$form, $form_state, $form_id) {
       '#collapsible' => TRUE,
     );
 
-    if (isset($settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])])) {
-      $default_value = $settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])] ? $settings['block-' . str_replace('_', '-', $form['module']['#value']) . '-' . str_replace('_', '-', $form['delta']['#value'])] : variable_get('collapsiblock_default_state', 1);
-    }
-    else {
-      $default_value = 1;
+    $block_id = 'block-' . str_replace('_', '-', $form['module']['#value']);
+    $block_id .= '-' . drupal_strtolower(str_replace('_', '-', $form['delta']['#value']));
+    $default_value = variable_get('collapsiblock_default_state', 1);
+    if (isset($settings[$block_id])) {
+      $default_value = $settings[$block_id];
     }
+
     $form['settings']['collapsiblock']['collapse_type'] = array(
       '#type' => 'radios',
       '#title' => t('Block collapse behavior'),