diff --git a/src/main/java/com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java b/src/main/java/com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
index 0450e613..e31e6c7e 100644
--- a/src/main/java/com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
+++ b/src/main/java/com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
@@ -499,7 +499,7 @@ private Map<String, String> computeDescriptionPropertyValueMap(String effectiveV
         String[] descriptionPropertyValues =
             StringUtils.split(effectiveDescriptionPropertyValue, ',');
         for (int i = 0; i < values.length && i < descriptionPropertyValues.length; i++) {
-          descriptionPropertyValueMap.put(values[i], descriptionPropertyValues[i]);
+          descriptionPropertyValueMap.put(StringUtils.trim(values[i]), StringUtils.trim(descriptionPropertyValues[i]));
         }
       }
     }