diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
index 87c9629dc..77ea7ea4d 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
@@ -640,9 +640,13 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) {
 
     // Handles exiting the inventory editor with the L button
     // The editor is opened with `debugState` set to 1, and becomes closable after a frame once `debugState` is set to 2
+    s16 Debug_BTN = BTN_L;
+    if (CVar_GetS32("gNGCKaleidoSwitcher", 0) != 1) {
+        Debug_BTN = BTN_Z;
+    }
     if (pauseCtx->debugState == 1) {
         pauseCtx->debugState = 2;
-    } else if ((pauseCtx->debugState == 2) && CHECK_BTN_ALL(input->press.button, BTN_L)) {
+    } else if ((pauseCtx->debugState == 2) && CHECK_BTN_ALL(input->press.button, Debug_BTN)) {
         pauseCtx->debugState = 0;
     }