diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp
index a08584cf67..b7f357c958 100644
--- a/Userland/Libraries/LibWeb/DOM/Document.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Document.cpp
@@ -585,8 +585,6 @@ void Document::update_layout()
     root_formatting_context.run(*m_layout_root, Layout::LayoutMode::Normal);
     formatting_state.commit();
 
-    m_layout_root->build_stacking_context_tree();
-
     browsing_context()->set_needs_display();
 
     if (browsing_context()->is_top_level()) {
diff --git a/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp
index 724352db54..a077dfcdcf 100644
--- a/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp
+++ b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp
@@ -18,13 +18,19 @@ InitialContainingBlock::InitialContainingBlock(DOM::Document& document, NonnullR
 
 InitialContainingBlock::~InitialContainingBlock() = default;
 
+void InitialContainingBlock::build_stacking_context_tree_if_needed()
+{
+    if (paint_box()->stacking_context())
+        return;
+    build_stacking_context_tree();
+}
+
 void InitialContainingBlock::build_stacking_context_tree()
 {
     const_cast<Painting::PaintableWithLines*>(paint_box())->set_stacking_context(make<Painting::StackingContext>(*this, nullptr));
 
-    for_each_in_inclusive_subtree_of_type<Box>([&](Box& box) {
-        if (&box == this)
-            return IterationDecision::Continue;
+    for_each_in_subtree_of_type<Box>([&](Box& box) {
+        const_cast<Painting::PaintableBox*>(box.paint_box())->invalidate_stacking_context();
         if (!box.establishes_stacking_context()) {
             VERIFY(!box.paint_box()->stacking_context());
             return IterationDecision::Continue;
@@ -40,6 +46,7 @@ void InitialContainingBlock::build_stacking_context_tree()
 
 void InitialContainingBlock::paint_all_phases(PaintContext& context)
 {
+    build_stacking_context_tree_if_needed();
     context.painter().fill_rect(enclosing_int_rect(paint_box()->absolute_rect()), context.palette().base());
     context.painter().translate(-context.viewport_rect().location());
     paint_box()->stacking_context()->paint(context);
diff --git a/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h
index db360f656d..2c35b82f1c 100644
--- a/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h
+++ b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h
@@ -24,11 +24,11 @@ public:
     void set_selection(const LayoutRange&);
     void set_selection_end(const LayoutPosition&);
 
-    void build_stacking_context_tree();
-
+    void build_stacking_context_tree_if_needed();
     void recompute_selection_states();
 
 private:
+    void build_stacking_context_tree();
     virtual bool is_initial_containing_block_box() const override { return true; }
 
     LayoutRange m_selection;
diff --git a/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp b/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
index 2cdfbbbf22..670aae965f 100644
--- a/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
+++ b/Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
@@ -7,6 +7,7 @@
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/HTMLHtmlElement.h>
 #include <LibWeb/Layout/BlockContainer.h>
+#include <LibWeb/Layout/InitialContainingBlock.h>
 #include <LibWeb/Painting/BackgroundPainting.h>
 #include <LibWeb/Painting/PaintableBox.h>
 #include <LibWeb/Painting/ShadowPainting.h>
@@ -28,6 +29,11 @@ PaintableBox::~PaintableBox()
 {
 }
 
+void PaintableBox::invalidate_stacking_context()
+{
+    m_stacking_context = nullptr;
+}
+
 PaintableWithLines::PaintableWithLines(Layout::BlockContainer const& layout_box)
     : PaintableBox(layout_box)
 {
@@ -524,8 +530,10 @@ void PaintableBox::for_each_child_in_paint_order(Callback callback) const
 
 HitTestResult PaintableBox::hit_test(Gfx::FloatPoint const& position, HitTestType type) const
 {
-    if (layout_box().is_initial_containing_block_box())
+    if (layout_box().is_initial_containing_block_box()) {
+        const_cast<Layout::InitialContainingBlock&>(static_cast<Layout::InitialContainingBlock const&>(layout_box())).build_stacking_context_tree_if_needed();
         return stacking_context()->hit_test(position, type);
+    }
 
     HitTestResult result { absolute_border_box_rect().contains(position.x(), position.y()) ? this : nullptr };
     for_each_child_in_paint_order([&](auto& child) {
diff --git a/Userland/Libraries/LibWeb/Painting/PaintableBox.h b/Userland/Libraries/LibWeb/Painting/PaintableBox.h
index 649586d9ac..a4673f1201 100644
--- a/Userland/Libraries/LibWeb/Painting/PaintableBox.h
+++ b/Userland/Libraries/LibWeb/Painting/PaintableBox.h
@@ -117,6 +117,8 @@ public:
 
     virtual HitTestResult hit_test(Gfx::FloatPoint const&, HitTestType) const override;
 
+    void invalidate_stacking_context();
+
 protected:
     explicit PaintableBox(Layout::Box const&);