diff --git a/source/main.cpp b/source/main.cpp
index facd2f89..71e7ccfb 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -67,7 +67,11 @@ void ExitApp()
 {
 	ShutoffRumble();
 	StopGX();
-	ShutdownAudio();
+	ShutdownAudio();
+
+    fatUnmount("SD");
+	__io_wiisd.shutdown();
+
     //WPAD_Flush(0);
     //WPAD_Disconnect(0);
     //WPAD_Shutdown();
@@ -134,7 +138,7 @@ main(int argc, char *argv[])
 
     __io_wiisd.startup();
 	fatMountSimple("SD", &__io_wiisd);
-	
+
 	Sys_Init();
 	//Video_SetMode();
 	//Con_Init(CONSOLE_XCOORD, CONSOLE_YCOORD, CONSOLE_WIDTH, CONSOLE_HEIGHT);
diff --git a/source/menu.cpp b/source/menu.cpp
index ca3a024a..57729953 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -423,7 +423,7 @@ WiiMenuWindowPrompt(const char *title, const char *btn1Label, const char *btn2La
 	btn3.SetTrigger(&trigB);
 	btn3.SetTrigger(&trigA);
 	btn3.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust buttons for widescreen
 		btn1.SetPosition(-70, -120);
 		btn2.SetPosition(70, -120);
@@ -549,7 +549,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch
 	btn2.SetTrigger(&trigB);
 	btn2.SetTrigger(&trigA);
 	btn2.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust buttons for widescreen
 		msgTxt.SetMaxWidth(330);
 		if(btn2Label)
@@ -563,7 +563,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch
 		btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
 		btn1.SetPosition(0, -80);
 	}
-	}	
+	}
 	promptWindow.Append(&dialogBoxImg);
 	promptWindow.Append(&titleTxt);
 	promptWindow.Append(&msgTxt);
@@ -689,7 +689,7 @@ DownloadWindowPrompt()
 	btn4.SetSoundClick(&btnClick);
 	btn4.SetTrigger(&trigA);
 	btn4.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust buttons for widescreen
 		btn1.SetPosition(-70, -120);
 		btn2.SetPosition(70, -120);
@@ -1212,7 +1212,7 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	btn2.SetSoundClick(&btnClick);
 	btn2.SetTrigger(&trigA);
 	btn2.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust buttons for widescreen
 		msgTxt.SetMaxWidth(380);
 		if(btn2Label)
@@ -1358,7 +1358,7 @@ int NetworkInitPromp(int choice2)
 	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
 	btn1.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust buttons for widescreen
 		btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
 		btn1.SetPosition(0, -80);
@@ -1560,7 +1560,7 @@ ProgressWindow(const char *title, const char *msg)
 
     timeTxt.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
 	timeTxt.SetPosition(0,-50);
-	
+
 	if (CFG.widescreen){/////////////adjust for widescreen
 		progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 		progressbarOutlineImg.SetPosition(0, 40);
@@ -1673,7 +1673,7 @@ ProgressDownloadWindow(int choice2)
 	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
 	btn1.SetEffectGrow();
-	
+
 	if (CFG.widescreen){/////////////adjust for widescreen
 		progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 		progressbarOutlineImg.SetPosition(0, 40);
@@ -1724,7 +1724,7 @@ ProgressDownloadWindow(int choice2)
 	sprintf(prozent, "%i%%", 100*i/cntMissFiles);
 	prTxt.SetText(prozent);
 	prTxt.SetFont(fontClock);
-	
+
 	if (CFG.widescreen){/////////////adjust for widescreen
 		progressbarImg.SetPosition(80,40);
 		progressbarImg.SetTile(80*i/cntMissFiles);
@@ -3429,7 +3429,7 @@ static int MenuSettings()
     GuiText ttpage2Txt("Go to Page 2", 20, (GXColor){0, 0, 0, 255});
     GuiImage ttpage2Img(&ttpage);
 	//ttpage2Img.SetWidescreen(CFG.widescreen);//////
-	
+
     if (Settings.tooltips == TooltipsOn && THEME.showToolTip != 0)
     page2Btn.SetToolTip(&ttpage2Img,&ttpage2Txt,105,0);
 
@@ -4289,8 +4289,7 @@ int MainMenu(int menu)
 	delete coverImg;
 
 	mainWindow = NULL;
-	fatUnmount("SD");
-	__io_wiisd.shutdown();
+
     ExitApp();
 
     struct discHdr *header = &gameList[gameSelected];
diff --git a/source/sys.c b/source/sys.c
index 90ecf73c..6aa57315 100644
--- a/source/sys.c
+++ b/source/sys.c
@@ -74,9 +74,6 @@ int Sys_IosReload(int IOS)
     WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
     WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight);
 
-    __io_wiisd.startup();
-    fatMountSimple("SD", &__io_wiisd);
-
     if(IOS == 249 || IOS == 222) {
     ret = WBFS_Init(WBFS_DEVICE_USB);
     ret = Disc_Init();