diff --git a/contrib/current_search/current_search.block.inc b/contrib/current_search/current_search.block.inc
index 3a868c2..1fe1151 100644
--- a/contrib/current_search/current_search.block.inc
+++ b/contrib/current_search/current_search.block.inc
@@ -169,9 +169,18 @@ function current_search_check_visibility($delta) {
     return FALSE;
   }
 
-  // Returns TRUE if search keys were entered by the user or this block is
-  // configured to be displayed on empty pages.
-  return ($adapter->getSearchKeys() || $config->settings['advanced']['empty_searches']);
+  // Returns TRUE based on the empty_searches setting and the current search.
+  switch ($config->settings['advanced']['empty_searches']) {
+    case CURRENT_SEARCH_DISPLAY_KEYS:
+      return ($adapter->getSearchKeys());
+    case CURRENT_SEARCH_DISPLAY_FILTERS:
+      return ($adapter->getAllActiveItems());
+    case CURRENT_SEARCH_DISPLAY_KEYS_FILTERS:
+      return ($adapter->getSearchKeys() || $adapter->getAllActiveItems());
+    case CURRENT_SEARCH_DISPLAY_ALWAYS:
+    default:
+      return TRUE;
+  }
 }
 
 /**
diff --git a/contrib/current_search/current_search.module b/contrib/current_search/current_search.module
index b802dca..21fa39c 100644
--- a/contrib/current_search/current_search.module
+++ b/contrib/current_search/current_search.module
@@ -6,6 +6,27 @@
  * current search.
  */
 
+/**
+ * Display current search block only when keywords are entered.
+ */
+define('CURRENT_SEARCH_DISPLAY_KEYS', 0);
+
+/**
+ * Display current search block on empty searches where no keywords are entered.
+ */
+define('CURRENT_SEARCH_DISPLAY_ALWAYS', 1);
+
+/**
+ * Display current search block only when one or more facet items are active.
+ */
+define('CURRENT_SEARCH_DISPLAY_FILTERS', 2);
+
+/**
+ * Display current search block when either keywords are entered one or more
+ * facet items are active.
+ */
+define('CURRENT_SEARCH_DISPLAY_KEYS_FILTERS', 3);
+
 // Includes the Block hooks and form alterations.
 require_once dirname(__FILE__) . '/current_search.block.inc';
 
diff --git a/contrib/current_search/plugins/export_ui/current_search_export_ui.class.php b/contrib/current_search/plugins/export_ui/current_search_export_ui.class.php
index 346a5be..9871f9e 100644
--- a/contrib/current_search/plugins/export_ui/current_search_export_ui.class.php
+++ b/contrib/current_search/plugins/export_ui/current_search_export_ui.class.php
@@ -426,10 +426,23 @@ function current_search_settings_form(&$form, &$form_state) {
     '#tree' => TRUE,
   );
 
+  // This setting was originally intended as a way for site builders to enable
+  // the current search block on pages where no keywords were submitted by the
+  // end user, which is known as an "empty search". The display settings were
+  // expanded beyond empty searches at http://drupal.org/node/1779670, leaving
+  // us with the unfortunate "empty_searches" key which no longer reflects what
+  // this setting does.
   $form['advanced_settings']['empty_searches'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Display current search block on empty search pages.'),
-    '#default_value' => !empty($item->settings['advanced']['empty_searches']),
+    '#type' => 'radios',
+    '#title' => t('Display settings'),
+    '#options' => array(
+      CURRENT_SEARCH_DISPLAY_KEYS => t('Display only when keywords are entered.'),
+      CURRENT_SEARCH_DISPLAY_ALWAYS => t('Display on empty searches where no keywords are entered.'),
+      CURRENT_SEARCH_DISPLAY_FILTERS => t('Display only when one or more facet items are active.'),
+      CURRENT_SEARCH_DISPLAY_KEYS_FILTERS => t('Display when either keywords are entered one or more facet items are active.'),
+    ),
+    '#default_value' => $item->settings['advanced']['empty_searches'],
+    '#description' => t('This setting determines when the current search block will be displayed.'),
   );
 
 }