diff --git a/modules/Settings/Picklist/actions/SaveAjax.php b/modules/Settings/Picklist/actions/SaveAjax.php
index 9436a101b54d2944b8734eb8fe5122ccfa778f1f..2388760f1102325af112098d802132c9d519d780 100644
--- a/modules/Settings/Picklist/actions/SaveAjax.php
+++ b/modules/Settings/Picklist/actions/SaveAjax.php
@@ -28,7 +28,13 @@ class Settings_Picklist_SaveAjax_Action extends Settings_Vtiger_Basic_Action {
     /*
      * @function updates user tables with new picklist value for default event and status fields
      */
-    public function updateDefaultPicklistValues($pickListFieldName,$oldValue,$newValue) {
+	public function updateDefaultPicklistValues($pickListFieldName,$oldValue,$newValue) {
+
+		// No change in value - likely a color change.
+		if ($oldValue == $newValue) {
+			return;
+		}
+
 		$db = PearDatabase::getInstance();
             if($pickListFieldName == 'activitytype')
                 $defaultFieldName = 'defaultactivitytype';
@@ -257,4 +263,4 @@ class Settings_Picklist_SaveAjax_Action extends Settings_Vtiger_Basic_Action {
         
         $response->emit();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index f4e97007b05f23597f2bd8ee0e08eef771656550..ca39d3f3ca46914420fb2fd5303bc1564f4daf07 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -488,6 +488,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 			$query = 'SELECT '.$primaryKey.',color,'.$fieldName.' FROM vtiger_'.$fieldName;
 			$result = $db->pquery($query);
 			$pickListColorMap = array();
+			$isRoleBasedPicklist = vtws_isRoleBasedPicklist($fieldName);
 			$accessablePicklistValues = self::getAccessiblePicklistValues($fieldName);
 			if($db->num_rows($result) > 0){
 				for($i=0; $i<$db->num_rows($result); $i++) {
@@ -496,7 +497,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 					$picklistNameRaw = $db->query_result($result, $i, $fieldName);
 					$picklistName = decode_html($picklistNameRaw);
 					// show color only for accesable picklist values
-					if(vtws_isRoleBasedPicklist($fieldName) && !isset($accessablePicklistValues[$picklistNameRaw])) {
+					if($isRoleBasedPicklist && !isset($accessablePicklistValues[$picklistNameRaw])) {
 						$color = '';
 					}
 					if(!empty($color)) {