diff --git a/source/plg_system_t3/includes/core/bot.php b/source/plg_system_t3/includes/core/bot.php
index 1f58e1c0d2..21eec506de 100644
--- a/source/plg_system_t3/includes/core/bot.php
+++ b/source/plg_system_t3/includes/core/bot.php
@@ -392,10 +392,11 @@ public static function extraFields(&$form, $data, $tplpath){
 					$app   = JFactory::getApplication();
 					$input = $app->input;
 					$fdata = empty($data) ? $input->post->get('jform', array(), 'array') : (is_object($data) ? $data->getProperties() : $data);
-					$catid = $input->getInt('catid', $app->getUserState('com_content.articles.filter.category_id'));
-
-					if(!$catid && is_array($fdata) && !empty($fdata)){
-						$catid = $fdata['catid'];
+					
+					if(!empty($fdata['catid']) && is_array($fdata['catid'])) { // create new
+						$catid = end($fdata['catid']);
+					} else { // edit
+						$catid = ($fdata['catid']);
 					}
 
 					if($catid){