diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c
index 235f91d..069974f 100644
--- a/nyx/nyx_gui/frontend/gui.c
+++ b/nyx/nyx_gui/frontend/gui.c
@@ -850,7 +850,7 @@ static void _launch_hos(u8 autoboot, u8 autoboot_list)
 	b_cfg->boot_cfg = BOOT_CFG_AUTOBOOT_EN;
 	if (launch_logs_enable)
 		b_cfg->boot_cfg |= BOOT_CFG_FROM_LAUNCH;
-	b_cfg->autoboot = autoboot & ~0x80;
+	b_cfg->autoboot = autoboot;
 	b_cfg->autoboot_list = autoboot_list;
 
 	void (*main_ptr)() = (void *)nyx_str->hekate;
@@ -859,10 +859,6 @@ static void _launch_hos(u8 autoboot, u8 autoboot_list)
 
 	hw_reinit_workaround(false, 0);
 
-	// Mitigate L4T Joy-Con driver issue.
-	if ((autoboot & 0x80) && h_cfg.bootwait < 2)
-		msleep((2 - h_cfg.bootwait) * 1000);
-
 	(*main_ptr)();
 }
 
@@ -1626,7 +1622,7 @@ ini_parsing:
 					continue;
 
 				icon_path = NULL;
-				u32 payload = 0;
+				bool payload = false;
 				bool img_colorize = false;
 				lv_img_dsc_t *bmp = NULL;
 				lv_obj_t *img = NULL;
@@ -1637,13 +1633,7 @@ ini_parsing:
 					if (!strcmp("icon", kv->key))
 						icon_path = kv->val;
 					else if (!strcmp("payload", kv->key))
-					{
-						payload = 1;
-
-						// Mitigate L4T Joy-Con driver issue.
-						if (!memcmp(kv->val + strlen(kv->val) - 3, "rom", 3))
-							payload = 2;
-					}
+						payload = true;
 				}
 
 				// If icon not found, check res folder for section_name.bmp.
@@ -1710,9 +1700,9 @@ ini_parsing:
 
 				// Set autoboot index.
 				ext = lv_obj_get_ext_attr(btn);
-				ext->idx = payload != 2 ? i : (i | 0x80);
+				ext->idx = i;
 				ext = lv_obj_get_ext_attr(launch_ctxt[curr_btn_idx]); // Redundancy.
-				ext->idx = payload != 2 ? i : (i | 0x80);
+				ext->idx = i;
 
 				// Set action.
 				if (!more_cfg)