diff --git a/plugins/context_reaction_block.inc b/plugins/context_reaction_block.inc
index 52f9fe9..b3d8910 100644
--- a/plugins/context_reaction_block.inc
+++ b/plugins/context_reaction_block.inc
@@ -142,6 +142,22 @@ class context_reaction_block extends context_reaction {
         'context' => $context
       )),
     );
+
+    // Don't show toggle if show empty regions is shown globally
+    if (!variable_get('context_reaction_block_all_regions', FALSE)) {
+      if (isset($_SESSION['context-reaction-showall']) && $_SESSION['context-reaction-showall'] === TRUE) {
+        $value = t('Hide empty regions');
+      }
+      else {
+        $value = t('Show empty regions');
+      }
+      $form['showall_toggle'] = array(
+        '#type' => 'submit',
+        '#value' => $value,
+        '#submit' => array('context_reaction_block_toggle_submit'),
+      );
+    }
+
     $this->rebuild_needed(FALSE);
     return $form;
   }
@@ -296,7 +312,8 @@ class context_reaction_block extends context_reaction {
     if ($this->is_editable_region($region) &&
         (!empty($build) ||
          variable_get('context_reaction_block_all_regions', FALSE) ||
-         context_isset('context_ui', 'context_ui_editor_present'))
+         context_isset('context_ui', 'context_ui_editor_present')) ||
+         (isset($_SESSION['context-reaction-showall']) && $_SESSION['context-reaction-showall'] === TRUE)
     ) {
       global $theme;
       $regions = system_region_list($theme);
@@ -613,3 +630,18 @@ class context_reaction_block extends context_reaction {
     drupal_exit();
   }
 }
+
+/**
+ * Submit hanlder for the Toggle empty regions button.
+ */
+function context_reaction_block_toggle_submit(&$form, &$form_state) {
+  // Get the current status
+  $status = empty($_SESSION['context-reaction-showall']) ? FALSE : $_SESSION['context-reaction-showall'];
+  if ($status === FALSE) {
+    $_SESSION['context-reaction-showall'] = TRUE;
+  }
+  else {
+    $_SESSION['context-reaction-showall'] = FALSE;
+  }
+  return;
+}
diff --git a/plugins/context_reaction_css_injector.inc b/plugins/context_reaction_css_injector.inc
index 5fedb79..9ccb82a 100644
--- a/plugins/context_reaction_css_injector.inc
+++ b/plugins/context_reaction_css_injector.inc
@@ -24,10 +24,11 @@ class context_reaction_css_injector extends context_reaction {
       if (!empty($context->reactions[$this->plugin])) {
         foreach ($context->reactions[$this->plugin] as $crid) {
           if ($css_rule = _css_injector_load_rule($crid)) {
-            drupal_add_css(file_create_path($css_rule['file_path']), 'module', $css_rule['media'], $css_rule['preprocess']);
+            ctools_include('css');
+            ctools_css_add_css(_css_injector_rule_filename($css_rule['crid']), 'module', $css_rule['media'], $css_rule['preprocess']);
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}