From 5ca0a2ba06a137d14b2f4514ff035f874539d7d6 Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 5 May 2026 14:17:57 -0600
Subject: [PATCH] UI: Fix focus reconciliation for context root

---
 src/dusk/ui/ui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dusk/ui/ui.cpp b/src/dusk/ui/ui.cpp
index a159151a76..d9463dafc0 100644
--- a/src/dusk/ui/ui.cpp
+++ b/src/dusk/ui/ui.cpp
@@ -103,7 +103,8 @@ void update() noexcept {
 
     // If no documents have focus, explicitly focus the top one
     if (auto* context = aurora::rmlui::get_context();
-        context != nullptr && context->GetFocusElement() == nullptr)
+        context != nullptr && (context->GetFocusElement() == nullptr ||
+                                  context->GetFocusElement() == context->GetRootElement()))
     {
         for (auto& doc : std::views::reverse(sDocuments)) {
             if (!doc->closed() && !doc->pending_close() && doc->focus()) {