1 files changed, 3 insertions, 8 deletions
diff --git a/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp b/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp
index 3b96b716..fb6f4705 100644
--- a/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp
+++ b/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp
@@ -6,19 +6,14 @@ CheckBoxPropertyEditor::CheckBoxPropertyEditor() {
   container_.AddChild(&label_);
   container_.AddChild(&check_box_);
 
-  check_box_.CheckedChangeEvent()->AddSpyOnlyHandler([this] {
-    if (!suppress_next_change_event_) {
-      change_event_.Raise(nullptr);
-    } else {
-      suppress_next_change_event_ = false;
-    }
-  });
+  check_box_.CheckedChangeEvent()->AddSpyOnlyHandler(
+      [this] { RaiseChangeEvent(); });
 }
 
 CheckBoxPropertyEditor::~CheckBoxPropertyEditor() {}
 
 void CheckBoxPropertyEditor::SetValue(bool value, bool trigger_change) {
-  if (!trigger_change) suppress_next_change_event_ = true;
+  if (!trigger_change) SuppressNextChangeEvent();
   check_box_.SetChecked(value);
 }
 }  // namespace cru::theme_builder::components::properties