2 files changed, 14 insertions, 6 deletions
diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/theme_builder/components/StyleRuleEditor.cpp
index 8b9df6db..1cbeaeb2 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/theme_builder/components/StyleRuleEditor.cpp
@@ -5,7 +5,10 @@ StyleRuleEditor::StyleRuleEditor() {
   main_layout_ = ui::controls::FlexLayout::Create();
 }
 
-StyleRuleEditor::~StyleRuleEditor() {}
+StyleRuleEditor::~StyleRuleEditor() {
+  main_layout_->RemoveFromParent();
+  delete main_layout_;
+}
 
 void StyleRuleEditor::BindStyleRule(ui::style::StyleRule *rule) {
   style_rule_ = rule;
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp
index cfb2ad56..313b53da 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/theme_builder/components/StyleRuleSetEditor.cpp
@@ -1,9 +1,16 @@
 #include "StyleRuleSetEditor.h"
+#include "cru/ui/controls/FlexLayout.h"
 
 namespace cru::theme_builder {
-StyleRuleSetEditor::StyleRuleSetEditor() {}
+using namespace cru::ui::controls;
+StyleRuleSetEditor::StyleRuleSetEditor() {
+  main_layout_ = FlexLayout::Create();
+}
 
-StyleRuleSetEditor::~StyleRuleSetEditor() {}
+StyleRuleSetEditor::~StyleRuleSetEditor() {
+  main_layout_->RemoveFromParent();
+  delete main_layout_;
+}
 
 void StyleRuleSetEditor::BindStyleRuleSet(
     std::shared_ptr<ui::style::StyleRuleSet> rule_set) {
@@ -11,7 +18,5 @@ void StyleRuleSetEditor::BindStyleRuleSet(
   UpdateView();
 }
 
-void StyleRuleSetEditor::UpdateView() {
-  
-}
+void StyleRuleSetEditor::UpdateView() {}
 }  // namespace cru::theme_builder