diff --git a/soh/soh/Enhancements/BootToDebugWarpScreen.cpp b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp
index 60f9536dd..a2b8c6b60 100644
--- a/soh/soh/Enhancements/BootToDebugWarpScreen.cpp
+++ b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp
@@ -24,9 +24,22 @@ void OnFileChooseMainBootToDebugWarpScreen(void* gameState) {
     fileChooseContext->selectMode = SM_LOAD_GAME;
 }
 
+void OnZTitleUpdateBootToDebugWarpScreen(void* gameState) {
+    TitleContext* titleContext = (TitleContext*)gameState;
+
+    gSaveContext.seqId = (u8)NA_BGM_DISABLED;
+    gSaveContext.natureAmbienceId = 0xFF;
+    gSaveContext.gameMode = GAMEMODE_FILE_SELECT;
+    titleContext->state.running = false;
+
+    SET_NEXT_GAMESTATE(&titleContext->state, FileChoose_Init, FileChooseContext);
+}
+
 void RegisterBootToDebugWarpScreen() {
     COND_HOOK(OnFileChooseMain, CVAR_DEBUG_ENABLED_VALUE && CVAR_BOOT_TO_DEBUG_WARP_SCREEN_VALUE,
               OnFileChooseMainBootToDebugWarpScreen);
+    COND_HOOK(OnZTitleUpdate, CVAR_DEBUG_ENABLED_VALUE && CVAR_BOOT_TO_DEBUG_WARP_SCREEN_VALUE,
+              OnZTitleUpdateBootToDebugWarpScreen);
 }
 
 static RegisterShipInitFunc initFunc_BootToDebugWarpScreen(RegisterBootToDebugWarpScreen,
diff --git a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
index 487c8f8c2..029284fa4 100644
--- a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
+++ b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
@@ -183,16 +183,7 @@ void OnZTitleInitReplaceTitleMainWithCustom(void* gameState) {
 void OnZTitleUpdatePressButtonToSkip(void* gameState) {
     TitleContext* titleContext = (TitleContext*)gameState;
 
-    if ((CVarGetInteger(CVAR_DEVELOPER_TOOLS("DebugEnabled"), 0) != 0) &&
-        (CVarGetInteger(CVAR_DEVELOPER_TOOLS("BootToDebugWarpScreen"), 0) != 0)) {
-        // Boot to Debug Warp Screen
-        gSaveContext.seqId = (u8)NA_BGM_DISABLED;
-        gSaveContext.natureAmbienceId = 0xFF;
-        gSaveContext.gameMode = GAMEMODE_FILE_SELECT;
-        titleContext->state.running = false;
-
-        SET_NEXT_GAMESTATE(&titleContext->state, FileChoose_Init, FileChooseContext);
-    } else if (CHECK_BTN_ANY(titleContext->state.input->press.button, BTN_A | BTN_B | BTN_START)) {
+    if (CHECK_BTN_ANY(titleContext->state.input->press.button, BTN_A | BTN_B | BTN_START)) {
         // Force the title state to start fading to black and to last roughly 5 frames based on current fade in/out
         titleContext->visibleDuration = 0;
         titleContext->addAlpha = std::max<int16_t>((255 - titleContext->coverAlpha) / 5, 1);