diff --git a/includes/flag_handler_filter_flagged.inc b/includes/flag_handler_filter_flagged.inc
index ea04d93..5154125 100644
--- a/includes/flag_handler_filter_flagged.inc
+++ b/includes/flag_handler_filter_flagged.inc
@@ -21,10 +21,7 @@ class flag_handler_filter_flagged extends views_handler_filter_boolean_operator
     parent::options_form($form, $form_state);
     $form['value']['#type'] = 'radios';
     $form['value']['#title'] = t('Status');
-    $form['value']['#options'] = array(1 => t('Flagged'), 0 => t('Not flagged'));
-    if ($this->options['expose']['optional']) {
-      $form['value']['#options']['All'] = t('All');
-    }
+    $form['value']['#options'] = array(1 => t('Flagged'), 0 => t('Not flagged'), 'All' => t('All'));
     $form['value']['#default_value'] = empty($this->options['value']) ? 0 : $this->options['value'];
     $form['value']['#description'] = '<p>' . t('This filter is only needed if the relationship used has the "Include only flagged content" option <strong>unchecked</strong>. Otherwise, this filter is useless, because all records are already limited to flagged content.') . '</p><p>' . t('By choosing <em>Not flagged</em>, it is possible to create a list of content <a href="@unflagged-url">that is specifically not flagged</a>.', array('@unflagged-url' => 'http://drupal.org/node/299335')) . '</p>';
   }