diff --git a/contrib/current_search/current_search.block.inc b/contrib/current_search/current_search.block.inc
index 3a868c2..9f2cd53 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 FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS:
+      return ($adapter->getSearchKeys());
+    case FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_FILTERS:
+      return ($adapter->getAllActiveItems());
+    case FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS_FILTERS:
+      return ($adapter->getSearchKeys() || $adapter->getAllActiveItems());
+    case FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_ALWAYS:
+    default:
+      return TRUE;
+  }
 }
 
 /**
diff --git a/contrib/current_search/current_search.current_search.inc b/contrib/current_search/current_search.current_search.inc
index 0fc1567..67a7f89 100644
--- a/contrib/current_search/current_search.current_search.inc
+++ b/contrib/current_search/current_search.current_search.inc
@@ -63,7 +63,7 @@ function current_search_current_search_default_items() {
       ),
     ),
     'advanced' => array(
-      'empty_searches' => 0,
+      'empty_searches' => FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS,
     ),
   );
   $items[$item->name] = $item;
diff --git a/contrib/current_search/current_search.module b/contrib/current_search/current_search.module
index b802dca..bd8d6aa 100644
--- a/contrib/current_search/current_search.module
+++ b/contrib/current_search/current_search.module
@@ -6,6 +6,14 @@
  * current search.
  */
 
+/**
+ * Options for the empty_searches setting.
+ */
+define('FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS', 0);
+define('FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_ALWAYS', 1);
+define('FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_FILTERS', 2);
+define('FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_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..218490a 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
@@ -427,9 +427,16 @@ function current_search_settings_form(&$form, &$form_state) {
   );
 
   $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('Empty search behavior'),
+    '#options' => array(
+      FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS => t('Display only if keywords are entered.'),
+      FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_ALWAYS => t('Display always.'),
+      FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_FILTERS => t('Display only if filters are present.'),
+      FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS_FILTERS => t('Display if filters or keywords are present.'),
+    ),
+    '#default_value' => isset($item->settings['advanced']['empty_searches']) ? $item->settings['advanced']['empty_searches'] : FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS,
+    '#description' => t('This setting determines when the current search block will be displayed.'),
   );
 
 }
@@ -630,7 +637,7 @@ function current_search_get_defaults() {
   return array(
     'items' => array(),
     'advanced' => array(
-      'empty_searches' => 0,
+      'empty_searches' => FACETAPI_CURRENT_SEARCH_EMPTY_SEARCHES_KEYS,
      ),
   );
 }