diff --git a/handlers/views_handler_filter.inc b/handlers/views_handler_filter.inc
index 8583605..e6d07e9 100644
--- a/handlers/views_handler_filter.inc
+++ b/handlers/views_handler_filter.inc
@@ -1173,6 +1173,7 @@ class views_handler_filter extends views_handler {
         $selected_group = $input[$this->options['group_info']['identifier']];
       }
       if ($selected_group == 'All' && !empty($this->options['group_info']['optional'])) {
+        $this->group_info = $selected_group;
         return NULL;
       }
       if ($selected_group != 'All' && empty($this->options['group_info']['group_items'][$selected_group])) {
@@ -1187,7 +1188,7 @@ class views_handler_filter extends views_handler {
         }
         $this->options['expose']['use_operator'] = TRUE;
 
-        $this->group_info = $input[$this->options['group_info']['identifier']];
+        $this->group_info = $selected_group;
         return TRUE;
       }
       else {
@@ -1251,7 +1252,7 @@ class views_handler_filter extends views_handler {
 
       $session = &$_SESSION['views'][$this->view->name][$display_id];
 
-      $session[$this->options['group_info']['identifier']] = $input[$this->options['group_info']['identifier']];
+      $session[$this->options['group_info']['identifier']] = $this->group_info;
     }
   }