diff --git a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
index 837650c3a679f8e8e46e48f814f9536916fe1ae4..2deab12c2ab46625d98679d6d429008d0abd1a01 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
@@ -491,7 +491,27 @@ Vtiger_Picklist_Field_Js('Workflows_Picklist_Field_Js',{},{
         var pickListValuesArrayFlip = {};
         for(var key in pickListValues){
             var pickListValue = pickListValues[key];
+            var translatedValues = new Array();
+            var selectedValues = selectedOption.split(",");
             pickListValuesArrayFlip[pickListValue] = key;
+            if(selectedValues.length > 1){
+                for(var index in selectedValues){
+                    var selectedValue = selectedValues[index];
+                    if(selectedValue == key){
+                        translatedValues.push(pickListValue);
+                    } else {
+                        //if condition is startswith, endswith, contains, doesnot contains should be retain the selected value in the picklist
+                        translatedValues.push(selectedValue);
+                    }
+                }
+            }else{
+                if(selectedOption == key){
+                        selectedOption = pickListValue;
+                }
+            }
+        }
+        if(selectedValues.length > 1){
+            selectedOption = translatedValues.join(",");
         }
         var html = '<input type="hidden" class="inputElement select2" name="'+ this.getName() +'" id="'+ this.getName() +'">';
         var selectContainer = jQuery(html).val(selectedOption);
diff --git a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
index 38383c60844494473fe149eecef4e7a322e49e3e..a2db141e52aee1bbfd15a9e5fc985c48fb13607b 100644
--- a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
@@ -332,15 +332,15 @@ jQuery.Class("Vtiger_AdvanceFilter_Js",{
 		fieldUiHolder.html(fieldSpecificUi);
 
 		if(fieldSpecificUi.is('input.select2')){
-			var tagElements = fieldSpecificUi.data('tags');
-			var params = {tags : tagElements,tokenSeparators: [","]}
-            vtUtils.showSelect2ElementView(fieldSpecificUi, params);
+                    var tagElements = fieldSpecificUi.data('tags');
+                    var params = {tags : tagElements,tokenSeparators: [","]}
+                    vtUtils.showSelect2ElementView(fieldSpecificUi, params);
 		} else if(fieldSpecificUi.is('select')){
-			if(fieldSpecificUi.hasClass('chzn-select')) {
-				app.changeSelectElementView(fieldSpecificUi)
-			}else{
-                vtUtils.showSelect2ElementView(fieldSpecificUi);
-			}
+                    if(fieldSpecificUi.hasClass('chzn-select')) {
+                        app.changeSelectElementView(fieldSpecificUi)
+                    }else{
+                        vtUtils.showSelect2ElementView(fieldSpecificUi);
+                    }
 		} else if (fieldSpecificUi.has('input.dateField').length > 0){
                         vtUtils.registerEventForDateFields(fieldSpecificUi);
 		} else if(fieldSpecificUi.has('input.timepicker-default').length > 0){
@@ -707,9 +707,29 @@ Vtiger_Picklist_Field_Js('AdvanceFilter_Picklist_Field_Js',{},{
 				tagsArray.push(app.htmlDecode(val));
 			});
 			var pickListValuesArrayFlip = {};
+                        var translatedValues = new Array();
+			var selectedValues = selectedOption.split(",");
 			for(var key in pickListValues){
-				var pickListValue = pickListValues[key];
-				pickListValuesArrayFlip[pickListValue] = key;
+                            var pickListValue = pickListValues[key];
+                            pickListValuesArrayFlip[pickListValue] = key;
+                            if(selectedValues.length > 1){
+                                for(var index in selectedValues){
+                                    var selectedValue = selectedValues[index];
+                                    if(selectedValue == key){
+                                        translatedValues.push(pickListValue);
+                                    } else {
+                                        //if condition is startswith, endswith, contains, doesnot contains should be retain the selected value in the picklist
+                                        translatedValues.push(selectedValue);
+                                    }
+                                }
+                            }else{
+                                if(selectedOption == key){
+                                        selectedOption = pickListValue;
+                                }
+                            }
+			}
+                        if(selectedValues.length > 1){
+                            selectedOption = translatedValues.join(",");
 			}
 			var html = '<input type="hidden" class="col-lg-12 select2" name="'+ this.getName() +'">';
 			var selectContainer = jQuery(html).val(selectedOption);