diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php
index eade7fecb19ca14e5b5e79699d061ce7a3da7061..7dc908af9f44cc8db39873dded4b5b507fdee988 100644
--- a/languages/en_us/Vtiger.php
+++ b/languages/en_us/Vtiger.php
@@ -1423,7 +1423,7 @@ $jsLanguageStrings = array(
 	'JS_SUBJECT_VALUE_CANT_BE_EMPTY' => 'Subject value cannot be empty',
 	'JS_PERCENTAGE_SHOULD_BE_LESS_THAN_100' => 'Percentage should be less than 100',
 
-
+	'INVALID PICKLIST'  => 'Invalid value for Picklist field',
 	'INVALID_NUMBER_OF' => 'Invalid number of',
 	'INVALID_NUMBER' => 'Invalid number',
 	'JS_LBL_ARE_YOU_SURE_YOU_WANT_TO_DELETE' => 'Are you sure that you want to delete?',
diff --git a/layouts/v7/modules/Settings/Workflows/resources/Edit.js b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
index 7f313207ad1fcb8645b342dcd6640da85ddb9260..26b8362b0a0f8dd2a1f7b71eafd28d88f3ea83bb 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/Edit.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
@@ -946,6 +946,19 @@ Settings_Vtiger_Edit_Js("Settings_Workflows_Edit_Js", {
 
       fieldUiHolder.html(fieldSpecificUi);
 
+      if (fieldInfo.type === 'picklist' || fieldInfo.type === 'multipicklist') {
+         var editablePicklistValues = Object.values(fieldInfo.editablepicklistvalues);
+         fieldSpecificUi.val(fieldInfo.value);
+         jQuery('.btn-success').on('click', function(event) {
+            var enteredValue = fieldSpecificUi.val().trim();
+            if (!editablePicklistValues.includes(enteredValue)) {
+               var message = app.vtranslate('INVALID PICKLIST');
+               app.helper.showErrorNotification({'message': message})
+               event.preventDefault();
+            }
+         });
+      }
+
       if (fieldSpecificUi.is('input.select2')) {
          var tagElements = fieldSpecificUi.data('tags');
          var params = {tags: tagElements, tokenSeparators: [","]}