diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java
index d00515501..3e154320a 100644
--- a/designer/src/com/fr/design/condition/PresentHighlightPane.java
+++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java
@@ -98,20 +98,22 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
 
     public  void populate(HighlightAction ha) {
         present = ((PresentHighlightAction)ha).getPresent();
-        if (!(present instanceof NormalPresent)) {
+        Object obj = ((PresentHighlightAction)ha).getValue();
+        if (!(present instanceof NormalPresent) && null == obj) {
             presentComboBox.setSelectedIndex(1);
         } else {
             presentComboBox.setSelectedIndex(0);
-            valueEditor.populate(((NormalPresent)present).getNormalPresent());
+            this.valueEditor.populate(obj);
         }
     }
 
     public HighlightAction update() {
-        if (presentComboBox.getSelectedIndex() == 0) {
-            if (this.valueEditor.update() instanceof String) {
+        Object value = this.valueEditor.update();
+        if (presentComboBox.getSelectedIndex() == 1) {
+            if (value instanceof String) {
                 present = new NormalPresent(this.valueEditor.update());
             }
         }
-        return new PresentHighlightAction(present);
+        return new PresentHighlightAction(this.valueEditor.update());
     }
 }
\ No newline at end of file