...

2 files changed, 4 insertions, 3 deletions

diff --git a/src/ui/controls/Button.cpp b/src/ui/controls/Button.cpp
index c6480b77..0f122650 100644
--- a/src/ui/controls/Button.cpp
+++ b/src/ui/controls/Button.cpp
@@ -15,8 +15,9 @@ Button::Button() : click_detector_(this) {
   SetContainerRenderObject(render_object_.get());
   render_object_->SetBorderEnabled(true);
 
-  GetStyleRuleSet()->SetParent(
-      &UiManager::GetInstance()->GetThemeResources()->button_style);
+  auto default_button_style =
+      UiManager::GetInstance()->GetThemeResources()->button_style.get();
+  GetStyleRuleSet()->SetParent(default_button_style);
 }
 
 Button::~Button() = default;
diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index 47706174..bf72b494 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -37,7 +37,7 @@ TextBox::TextBox()
 
   border_render_object_->SetBorderEnabled(true);
 
-  GetStyleRuleSet()->SetParent(&theme_resources->text_box_style);
+  GetStyleRuleSet()->SetParent(theme_resources->text_box_style.get());
 }
 
 TextBox::~TextBox() {}