diff --git a/javafx/src/main/java/dev/kske/undoredo/javafx/ChangeManagerWrapper.java b/javafx/src/main/java/dev/kske/undoredo/javafx/ChangeManagerWrapper.java
index 945477d..0abd163 100644
--- a/javafx/src/main/java/dev/kske/undoredo/javafx/ChangeManagerWrapper.java
+++ b/javafx/src/main/java/dev/kske/undoredo/javafx/ChangeManagerWrapper.java
@@ -47,6 +47,7 @@ public class ChangeManagerWrapper<C extends Change, M extends ChangeManager<C>>
 	 */
 	public ChangeManagerWrapper(M manager) {
 		this.manager = manager;
+		updateProperties();
 	}
 
 	@Override
diff --git a/javafx/src/main/java/dev/kske/undoredo/javafx/ObservableChangeManager.java b/javafx/src/main/java/dev/kske/undoredo/javafx/ObservableChangeManager.java
index 2908589..28ffebe 100644
--- a/javafx/src/main/java/dev/kske/undoredo/javafx/ObservableChangeManager.java
+++ b/javafx/src/main/java/dev/kske/undoredo/javafx/ObservableChangeManager.java
@@ -21,7 +21,7 @@ public interface ObservableChangeManager<C extends Change> extends ChangeManager
 
 	@Override
 	default Optional<C> getLastChange() {
-		return Optional.of(lastChangeProperty().get());
+		return Optional.ofNullable(lastChangeProperty().get());
 	}
 
 	ReadOnlyBooleanProperty atMarkedChangeProperty();