1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/layout_base.cpp b/src/ui/layout_base.cpp
index a384500a..5363c52b 100644
--- a/src/ui/layout_base.cpp
+++ b/src/ui/layout_base.cpp
@@ -8,8 +8,10 @@ namespace cru::ui
 {
     LayoutManager* LayoutManager::GetInstance()
     {
-        static LayoutManager layout_manager;
-        return &layout_manager;
+        return Application::GetInstance()->ResolveSingleton<LayoutManager>([](auto)
+        {
+            return new LayoutManager{};
+        });
     }
 
     void LayoutManager::InvalidateControlPositionCache(Control * control)