diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 43903cdf6c..b833379eff 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -181,10 +181,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		if(!$value['no_cat'] && !$value['cat_is_select'])
 		{
 			$cat_app = $value['cat_app'] ? $value['cat_app'] : $GLOBALS['egw_info']['flags']['current_app'];
-			$value['options-cat_id'] = array();
+			$value['options-cat_id'] = self::$request->sel_options['cat_id'] ? self::$request->sel_options['cat_id'] : array();
 
 			// Add 'All', if not already there
-			if(!$value['options-cat_id'][''] && !($value['options-cat_id'][0] && $value['options-cat_id'][0]['value'] == ''))
+			if(!$value['options-cat_id'][''] && !$value['options-cat_id'][0])
 			{
 				$value['options-cat_id'][''] = lang('all');
 			}
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index e9046a3be4..a37408061d 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -889,7 +889,7 @@ class timesheet_ui extends timesheet_bo
 		$sel_options = array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
-			'cat_id'     => array(lang('None')),
+			'cat_id'     => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
 			'ts_status'  => $this->status_labels+array(lang('No status')),
 		);
 		if($this->config_data['history'])