diff --git a/extern/aurora b/extern/aurora
index a40c9aeb61..6dd9aa2257 160000
--- a/extern/aurora
+++ b/extern/aurora
@@ -1 +1 @@
-Subproject commit a40c9aeb61dcfbae10f759ffc06268fbfd984b01
+Subproject commit 6dd9aa22577c3ebaaddc508a3945001290005092
diff --git a/res/rml/prelaunch.rcss b/res/rml/prelaunch.rcss
index 6c52f4cf82..6204eb75c1 100644
--- a/res/rml/prelaunch.rcss
+++ b/res/rml/prelaunch.rcss
@@ -12,7 +12,7 @@ body {
     background-color: #000000;
     decorator: image(../prelaunch-bg.png cover left center);
     filter: opacity(0);
-    transition: filter 1s 0.1s linear-in-out;
+    transition: filter 1s 0.2s linear-in-out;
 }
 
 body[open] {
diff --git a/src/dusk/ui/document.hpp b/src/dusk/ui/document.hpp
index e1ec173aa4..d0f4cae841 100644
--- a/src/dusk/ui/document.hpp
+++ b/src/dusk/ui/document.hpp
@@ -31,6 +31,10 @@ public:
             show();
         }
     }
+    void push(std::unique_ptr<Document> document) {
+        push_document(std::move(document));
+        hide(false);
+    }
     void pop() {
         hide(true);
         show_top_document();
diff --git a/src/dusk/ui/popup.cpp b/src/dusk/ui/popup.cpp
index 75658d965d..ddb3dcc428 100644
--- a/src/dusk/ui/popup.cpp
+++ b/src/dusk/ui/popup.cpp
@@ -35,11 +35,11 @@ Popup::Popup() : Document(kDocumentSource), mRoot(mDocument->GetElementById("pop
                                                   .onClose = [this] { hide(false); },
                                                   .autoSelect = false,
                                               });
-    mTabBar->add_tab("Settings", [] { push_document(std::make_unique<SettingsWindow>()); });
+    mTabBar->add_tab("Settings", [this] { push(std::make_unique<SettingsWindow>()); });
     // mTabBar->add_tab("Warp", [] {
     //     // TODO
     // });
-    mTabBar->add_tab("Editor", [] { push_document(std::make_unique<EditorWindow>()); });
+    mTabBar->add_tab("Editor", [this] { push(std::make_unique<EditorWindow>()); });
     mTabBar->add_tab("Reset", [this] {
         JUTGamePad::C3ButtonReset::sResetSwitchPushing = true;
         mTabBar->set_active_tab(-1);
diff --git a/src/dusk/ui/prelaunch.cpp b/src/dusk/ui/prelaunch.cpp
index 7b66437580..78af65af94 100644
--- a/src/dusk/ui/prelaunch.cpp
+++ b/src/dusk/ui/prelaunch.cpp
@@ -125,8 +125,7 @@ Prelaunch::Prelaunch() : Document(kDocumentSource), mRoot(mDocument->GetElementB
         apply_intro_animation(mMenuButtons.back()->root(), "delay-1");
 
         mMenuButtons.push_back(std::make_unique<Button>(menuList, "Options"));
-        mMenuButtons.back()->on_pressed(
-            [] { push_document(std::make_unique<PrelaunchOptions>()); });
+        mMenuButtons.back()->on_pressed([this] { push(std::make_unique<PrelaunchOptions>()); });
         apply_intro_animation(mMenuButtons.back()->root(), "delay-2");
 
         mMenuButtons.push_back(std::make_unique<Button>(menuList, "Quit To Desktop"));
diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp
index eb33f92b95..173b4d72e1 100644
--- a/src/dusk/ui/settings.cpp
+++ b/src/dusk/ui/settings.cpp
@@ -368,7 +368,7 @@ SettingsWindow::SettingsWindow() {
 
         leftPane.add_section("Controller");
         leftPane.add_button("Configure Controller")
-            .on_pressed([] { push_document(std::make_unique<ControllerConfigWindow>()); })
+            .on_pressed([this] { push(std::make_unique<ControllerConfigWindow>()); })
             .on_focus([&rightPane](Rml::Event&) {
                 rightPane.clear();
                 rightPane.add_text("Open controller binding configuration.");
@@ -474,10 +474,10 @@ SettingsWindow::SettingsWindow() {
                                getSettings().game.internalResolutionScale.getDefaultValue();
                     },
             })
-            .on_nav_command([](Rml::Event&, NavCommand cmd) {
+            .on_nav_command([this](Rml::Event&, NavCommand cmd) {
                 if (cmd == NavCommand::Confirm || cmd == NavCommand::Left ||
                     cmd == NavCommand::Right) {
-                    push_document(std::make_unique<Overlay>(OverlayProps{
+                    push(std::make_unique<Overlay>(OverlayProps{
                         .option = GraphicsOption::InternalResolution,
                         .title = "Internal Resolution",
                         .helpText = kInternalResolutionHelpText,
@@ -507,10 +507,10 @@ SettingsWindow::SettingsWindow() {
                                getSettings().game.shadowResolutionMultiplier.getDefaultValue();
                     },
             })
-            .on_nav_command([](Rml::Event&, NavCommand cmd) {
+            .on_nav_command([this](Rml::Event&, NavCommand cmd) {
                 if (cmd == NavCommand::Confirm || cmd == NavCommand::Left ||
                     cmd == NavCommand::Right) {
-                    push_document(std::make_unique<Overlay>(OverlayProps{
+                    push(std::make_unique<Overlay>(OverlayProps{
                         .option = GraphicsOption::ShadowResolution,
                         .title = "Shadow Resolution",
                         .helpText = kShadowResolutionHelpText,
@@ -542,10 +542,10 @@ SettingsWindow::SettingsWindow() {
                                getSettings().game.bloomMode.getDefaultValue();
                     },
             })
-            .on_nav_command([](Rml::Event&, NavCommand cmd) {
+            .on_nav_command([this](Rml::Event&, NavCommand cmd) {
                 if (cmd == NavCommand::Confirm || cmd == NavCommand::Left ||
                     cmd == NavCommand::Right) {
-                    push_document(std::make_unique<Overlay>(OverlayProps{
+                    push(std::make_unique<Overlay>(OverlayProps{
                         .option = GraphicsOption::BloomMode,
                         .title = "Bloom",
                         .helpText = kBloomHelpText,
@@ -577,10 +577,10 @@ SettingsWindow::SettingsWindow() {
                                getSettings().game.bloomMultiplier.getDefaultValue();
                     },
             })
-            .on_nav_command([](Rml::Event&, NavCommand cmd) {
+            .on_nav_command([this](Rml::Event&, NavCommand cmd) {
                 if (cmd == NavCommand::Confirm || cmd == NavCommand::Left ||
                     cmd == NavCommand::Right) {
-                    push_document(std::make_unique<Overlay>(OverlayProps{
+                    push(std::make_unique<Overlay>(OverlayProps{
                         .option = GraphicsOption::BloomMultiplier,
                         .title = "Bloom Brightness",
                         .helpText = kBloomBrightnessHelpText,
diff --git a/src/dusk/ui/ui.cpp b/src/dusk/ui/ui.cpp
index 51702bbdd3..87ee6c4b5d 100644
--- a/src/dusk/ui/ui.cpp
+++ b/src/dusk/ui/ui.cpp
@@ -52,9 +52,6 @@ void shutdown() noexcept {
 }
 
 Document& push_document(std::unique_ptr<Document> doc, bool show) noexcept {
-    if (auto* top = top_document()) {
-        top->hide(false);
-    }
     Document& ret = *doc;
     sDocuments.push_back({std::move(doc)});
     if (show) {