2 files changed, 7 insertions, 1 deletions
diff --git a/src/theme_builder/components/stylers/StylerEditor.cpp b/src/theme_builder/components/stylers/StylerEditor.cpp
index 8b18969c..662e5a08 100644
--- a/src/theme_builder/components/stylers/StylerEditor.cpp
+++ b/src/theme_builder/components/stylers/StylerEditor.cpp
@@ -1,4 +1,5 @@
 #include "StylerEditor.h"
+#include "../Common.h"
 #include "BorderStylerEditor.h"
 #include "CompoundStylerEditor.h"
 #include "ContentBrushStylerEditor.h"
@@ -13,6 +14,9 @@
 
 namespace cru::theme_builder::components::stylers {
 StylerEditor::StylerEditor() {
+  border_.SetChild(&container_);
+  border_.SetBackgroundBrush(CreateRandomEditorBackgroundBrush());
+
   container_.SetFlexDirection(ui::controls::FlexDirection::Vertical);
   container_.AddChild(&head_container_);
   container_.SetItemCrossAlign(ui::controls::FlexCrossAlignment::Start);
diff --git a/src/theme_builder/components/stylers/StylerEditor.h b/src/theme_builder/components/stylers/StylerEditor.h
index 482cce7d..3cbcb5a5 100644
--- a/src/theme_builder/components/stylers/StylerEditor.h
+++ b/src/theme_builder/components/stylers/StylerEditor.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "../Editor.h"
+#include "cru/ui/controls/Container.h"
 #include "cru/ui/controls/FlexLayout.h"
 #include "cru/ui/controls/TextBlock.h"
 #include "cru/ui/style/Styler.h"
@@ -11,7 +12,7 @@ class StylerEditor : public Editor {
   ~StylerEditor() override;
 
  public:
-  ui::controls::Control* GetRootControl() override { return &container_; }
+  ui::controls::Control* GetRootControl() override { return &border_; }
 
   ui::controls::FlexLayout* GetContainer() { return &container_; }
 
@@ -23,6 +24,7 @@ class StylerEditor : public Editor {
   virtual ClonablePtr<ui::style::Styler> GetStyler() = 0;
 
  private:
+  ui::controls::Container border_;
   ui::controls::FlexLayout container_;
   ui::controls::FlexLayout head_container_;
   ui::controls::TextBlock label_;