diff --git a/Libraries/LibWeb/Selection/Selection.cpp b/Libraries/LibWeb/Selection/Selection.cpp
index c2cf68f4678..6391939b154 100644
--- a/Libraries/LibWeb/Selection/Selection.cpp
+++ b/Libraries/LibWeb/Selection/Selection.cpp
@@ -550,6 +550,8 @@ void Selection::set_range(GC::Ptr<DOM::Range> range)
     // AD-HOC: Focus editing host if the previous selection was outside of it. There seems to be no spec for this.
     if (range && range->start_container()->is_editable_or_editing_host()) {
         GC::Ref new_editing_host = *range->start_container()->editing_host();
+        while (new_editing_host->parent() && new_editing_host->parent()->is_editing_host())
+            new_editing_host = *new_editing_host->parent();
         if (document()->focused_element() != new_editing_host) {
             // FIXME: Determine and propagate the right focus trigger.
             HTML::run_focusing_steps(new_editing_host, nullptr, HTML::FocusTrigger::Other);
diff --git a/Tests/LibWeb/Text/expected/selection-focuses-editing-host.txt b/Tests/LibWeb/Text/expected/selection-focuses-editing-host.txt
index be67c9120c4..d4681df908a 100644
--- a/Tests/LibWeb/Text/expected/selection-focuses-editing-host.txt
+++ b/Tests/LibWeb/Text/expected/selection-focuses-editing-host.txt
@@ -7,3 +7,9 @@ Range: [object Text] 1 [object Text] 1
 -- Refocusing on same editing host --
 Range: [object Text] 0 [object Text] 0
 <DIV id="b">
+-- Nested editing host --
+Range: [object Text] 0 [object Text] 3
+<DIV id="d">
+-- Nested editing host with uneditable element as parent --
+Range: [object Text] 0 [object Text] 3
+<SPAN>
diff --git a/Tests/LibWeb/Text/input/selection-focuses-editing-host.html b/Tests/LibWeb/Text/input/selection-focuses-editing-host.html
index 1b71c937e5f..37a0a2daae7 100644
--- a/Tests/LibWeb/Text/input/selection-focuses-editing-host.html
+++ b/Tests/LibWeb/Text/input/selection-focuses-editing-host.html
@@ -2,6 +2,8 @@
 <div id="a" contenteditable>foo</div>
 <div id="b" contenteditable>foo<span>bar</span></div>
 <button id="c">press me</button>
+<div id="d" contenteditable>foo <span contenteditable>bar</span></div>
+<div id="e" contenteditable>foo <span contenteditable="false">bar <span contenteditable>baz</span></span></div>
 <script src="include.js"></script>
 <script>
 test(() => {
@@ -27,5 +29,15 @@ test(() => {
     const buttonRect = buttonElm.getBoundingClientRect();
     internals.click(buttonRect.left + 5, buttonRect.top + 5);
     reportSelectionAndFocus();
+
+    println('-- Nested editing host --');
+    const spanC = document.querySelector('div#d span');
+    getSelection().setBaseAndExtent(spanC.childNodes[0], 0, spanC.childNodes[0], 3);
+    reportSelectionAndFocus();
+
+    println('-- Nested editing host with uneditable element as parent --');
+    const spanD = document.querySelector('div#e span span');
+    getSelection().setBaseAndExtent(spanD.childNodes[0], 0, spanD.childNodes[0], 3);
+    reportSelectionAndFocus();
 });
 </script>