diff --git a/source/main.cpp b/source/main.cpp
index 1673911c..a55fe764 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -73,6 +73,7 @@ int main(int argc, char **argv)
 		CurrentIOS.Base = 254;
 		CurrentIOS.Revision = 999;
 		DCFlushRange(&CurrentIOS, sizeof(IOS_Info));
+		DeviceHandler::Instance()->SetModes();
 	}
 	else if(*HW_AHBPROT != 0xFFFFFFFF)
 	{
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 74499f1c..c7828eb7 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -1104,8 +1104,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 			Sys_LoadMenu();
 		}
 		DeviceHandler::Instance()->UnMountAll();
-		Launch_nk(gameTitle, emuPath.c_str());
-		while(1);
+		Launch_nk(gameTitle, emuPath.size() > 1 ? emuPath.c_str() : NULL);
 	}
 	DeviceHandler::Instance()->UnMountAll();