diff --git a/controlsfx/src/main/java/org/controlsfx/property/editor/AbstractPropertyEditor.java b/controlsfx/src/main/java/org/controlsfx/property/editor/AbstractPropertyEditor.java
index 43e8ce6a..c243a604 100644
--- a/controlsfx/src/main/java/org/controlsfx/property/editor/AbstractPropertyEditor.java
+++ b/controlsfx/src/main/java/org/controlsfx/property/editor/AbstractPropertyEditor.java
@@ -80,15 +80,13 @@ public AbstractPropertyEditor(Item property, C control, boolean readonly) {
         this.control = control;
         this.property = property;
 
-        if (property.getObservableValue().isPresent()) {
-            property.getObservableValue().get().addListener((ObservableValue<? extends Object> o, Object oldValue, Object newValue) -> {
-                if (! suspendUpdate) {
-                    suspendUpdate = true;
-                    AbstractPropertyEditor.this.setValue((T) property.getValue());
-                    suspendUpdate = false;
-                }
-            });
-        }
+        property.getObservableValue().ifPresent(obs -> obs.addListener((ObservableValue<?> o, Object oldValue, Object newValue) -> {
+            if (!suspendUpdate) {
+                suspendUpdate = true;
+                AbstractPropertyEditor.this.setValue((T) property.getValue());
+                suspendUpdate = false;
+            }
+        }));
 
         if (! readonly) {
             getObservableValue().addListener((ObservableValue<? extends Object> o, Object oldValue, Object newValue) -> {