diff --git a/out/boot.dol b/out/boot.dol
index 940710f0..dca74301 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/loader/sys.c b/source/loader/sys.c
index 4dd856fd..7cf47e21 100644
--- a/source/loader/sys.c
+++ b/source/loader/sys.c
@@ -98,10 +98,15 @@ void Sys_Exit(void)
 {
 	/* Shutdown Inputs */
 	Close_Inputs();
-	/* Just shutdown  console*/
-	if(ExitOption == BUTTON_CALLBACK)
+	
+	/* shutdown console without wc24*/
+	if(ExitOption == SHUTDOWN_STANDBY)
 		SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
-
+		
+	/* shutdown console with wc24 (riiconnect24) */
+	if(ExitOption == SHUTDOWN_IDLE)
+		SYS_ResetSystem(SYS_POWEROFF_IDLE, 0, 0);
+		
 	if(!isWiiVC)
 	{
 		/* We wanna to boot something */
diff --git a/source/loader/sys.h b/source/loader/sys.h
index 2501f7e4..09132399 100644
--- a/source/loader/sys.h
+++ b/source/loader/sys.h
@@ -27,7 +27,8 @@ enum
 	EXIT_TO_BOOTMII,
 	EXIT_TO_WFNK2O,
 	EXIT_TO_SMNK2O,
-	BUTTON_CALLBACK,
+	SHUTDOWN_STANDBY,
+	SHUTDOWN_IDLE,
 	WIIFLOW_DEF,// m_cfg.getInt("GENERAL", "exit_to", 0). (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU)
 };
 
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index e6d9092d..d43f4f1f 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -1715,7 +1715,12 @@ void CMenu::_mainLoopCommon(bool withCF, bool adjusting)
 	
 	// check if power button is pressed and exit wiiflow
 	if(Sys_Exiting())
-		exitHandler(BUTTON_CALLBACK);
+	{
+		if(m_cfg.getBool("GENERAL", "idle_standby", false))
+			exitHandler(SHUTDOWN_IDLE);
+		else
+			exitHandler(SHUTDOWN_STANDBY);
+	}
 
 	// check if we need to start playing the game/banner sound
 	// m_gameSelected means we are on the game selected menu
diff --git a/source/menu/menu_boot.cpp b/source/menu/menu_boot.cpp
index 7b1b0e32..57413a4d 100644
--- a/source/menu/menu_boot.cpp
+++ b/source/menu/menu_boot.cpp
@@ -151,7 +151,7 @@ bool CMenu::_Boot(void)
 	bool cur_sd = m_cfg.getBool("GENERAL", "sd_only");
 	if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort || prev_sd != cur_sd)
 	{
-		error(_t("errboot8", L"Rebooting ..."));
+		error(_t("errboot8", L"Press 'A' to reload WiiFlow"));
 		m_exit = true;
 		m_reload = true;
 		return 1;
diff --git a/source/menu/menu_config7.cpp b/source/menu/menu_config7.cpp
index 753b1f15..e4660c16 100644
--- a/source/menu/menu_config7.cpp
+++ b/source/menu/menu_config7.cpp
@@ -66,7 +66,7 @@ void CMenu::_showConfig7(int curPage)
 		if(m_config7LblUser[i] != -1)
 			m_btnMgr.show(m_config7LblUser[i]);
 
-	if(curPage == 12)
+	/*if(curPage == 12)
 	{
 		m_btnMgr.show(m_config7Lbl1);
 		m_btnMgr.show(m_config7Btn1);
@@ -76,7 +76,7 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.show(m_config7Btn3);
 	}
 	else
-	{
+	{*/
 		m_btnMgr.show(m_config7Lbl1);
 		m_btnMgr.show(m_config7Btn1);
 		m_btnMgr.show(m_config7Lbl2);
@@ -85,7 +85,7 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.show(m_config7Btn3);
 		m_btnMgr.show(m_config7Lbl4);
 
-		if(curPage == 7 || curPage == 11)
+		if(curPage == 7 || curPage == 11 || curPage == 12)
 			m_btnMgr.show(m_config7Btn4);
 		else
 		{
@@ -93,7 +93,7 @@ void CMenu::_showConfig7(int curPage)
 			m_btnMgr.show(m_config7Btn4M);
 			m_btnMgr.show(m_config7Btn4P);
 		}
-	}
+	//}
 	
 	if(curPage == 7)
 	{
@@ -158,6 +158,8 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
 		m_btnMgr.setText(m_config7Lbl3, _t("cfg724", L"Lock coverflow layouts"));
 		m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("general", "cf_locked") ?  _t("yes", L"Yes") : _t("no", L"No"));
+		m_btnMgr.setText(m_config7Lbl4, _t("cfg725", L"Shutdown to idle standby"));
+		m_btnMgr.setText(m_config7Btn4, m_cfg.getBool("general", "idle_standby", false) ?  _t("yes", L"Yes") : _t("no", L"No"));
 	}
 }
 
@@ -327,6 +329,12 @@ int CMenu::_config7(int curPage)
 					m_btnMgr.setText(m_config7Btn3, val ?  _t("yes", L"Yes") : _t("no", L"No"));
 					CFLocked = val;
 				}
+				else if(m_btnMgr.selected(m_config7Btn4))
+				{
+					bool val = !m_cfg.getBool("general", "idle_standby");
+					m_cfg.setBool("general", "idle_standby", val);
+					m_btnMgr.setText(m_config7Btn4, val ?  _t("yes", L"Yes") : _t("no", L"No"));
+				}
 			}
 		}
 	}
diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini
index ca5ee485..b7fa149c 100644
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@@ -66,6 +66,7 @@ cfg721=Play GC default sound
 cfg722=Homebrew settings
 cfg723=Source menu settings
 cfg724=Lock coverflow layouts
+cfg725=Shutdown to idle standby
 cfga2=Install game
 cfga3=Install
 cfga6=Language
@@ -318,7 +319,7 @@ errboot4=No apps/wiiflow directory found!
 errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
 errboot6=No available usb partitions for data and no SD inserted!\nExiting.
 errboot7=Access denied in Wii VC mode.
-errboot8=Rebooting ...
+errboot8=Press 'A' to reload WiiFlow
 errgame1=Cannot find the game with ID: %s
 errgame2=No cIOS found!
 errgame4=Couldn't load IOS %i