diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/BoolButtonRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/BoolButtonRepresentation.java
index c3424b7ed4..69cf32ffcf 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/BoolButtonRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/BoolButtonRepresentation.java
@@ -223,7 +223,7 @@ protected void unregisterListeners()
         model_widget.propBit().removePropertyListener(bitChangedListener);
         model_widget.runtimePropValue().removePropertyListener(valueChangedListener);
         model_widget.propMode().removePropertyListener(modeChangeListener);
-        model_widget.propMode().removePropertyListener(confirmDialogWidgetPropertyListener);
+        model_widget.propConfirmDialog().removePropertyListener(confirmDialogWidgetPropertyListener);
         super.unregisterListeners();
     }