diff --git a/out/boot.dol b/out/boot.dol
index b2ff6e5e..1a57bc8e 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 23538e40..0ec6252f 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -11,7 +11,6 @@ extern const u32 gc_ogg_size;
 
 bool m_zoom_banner = false;
 bool m_banner_loaded = false;
-bool m_setMainBg = false;
 s16 m_gameBtnPlayFull;
 s16 m_gameBtnBackFull;
 s16 m_gameBtnToggle;
@@ -280,16 +279,14 @@ void CMenu::_showGame(void)
 		m_fa.getBackground(bg, bglq);
 		_setBg(*bg, *bglq);
 		CoverFlow.hideCover();
-		m_setMainBg = true;
 	}
-	else if(m_setMainBg)
+	else
 	{
 		CoverFlow.showCover();		
 		if(customBg)
 			_setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
 		else
 			_setBg(m_gameBg, m_gameBgLQ);
-		m_setMainBg = false;
 	}
 }
 
@@ -383,7 +380,6 @@ bool CMenu::_startVideo()
 void CMenu::_game(bool launch)
 {
 	m_banner_loaded = false;
-	m_setMainBg = true;
 	bool coverFlipped = false;
 	int cf_version = 1;
 	string domain;
@@ -442,7 +438,6 @@ void CMenu::_game(bool launch)
 					_setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
 				else
 					_setBg(m_gameBg, m_gameBgLQ);
-				m_setMainBg = false;
 			}
 			else //loop fanart
 				m_fa.reset();
@@ -513,7 +508,6 @@ void CMenu::_game(bool launch)
 			_hideGame();
 			m_banner.SetShowBanner(false);
 			_gameinfo();
-			m_setMainBg = true;
 			_showGame();
 			m_banner.SetShowBanner(true);
 		}
@@ -549,8 +543,10 @@ void CMenu::_game(bool launch)
 			{
 				m_fa.unload();
 				CoverFlow.showCover();
-				_setMainBg();
-				m_setMainBg = false;
+				if(customBg)
+					_setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
+				else
+					_setBg(m_gameBg, m_gameBgLQ);
 				continue;
 			}
 			/* delete button */
@@ -576,7 +572,6 @@ void CMenu::_game(bool launch)
 						startGameSound = -10;
 					}
 				}
-				m_setMainBg = true;
 				_showGame();
 				m_banner.SetShowBanner(true);
 			}
@@ -598,7 +593,6 @@ void CMenu::_game(bool launch)
 					m_banner.ToggleGameSettings();//reset brightness
 					m_banner.ToggleZoom();//de zoom to small
 				}
-				m_setMainBg = true;
 				_showGame();
 			}
 			else if(m_btnMgr.selected(m_gameBtnFavoriteOn) || m_btnMgr.selected(m_gameBtnFavoriteOff))
@@ -628,7 +622,6 @@ void CMenu::_game(bool launch)
 					m_banner.ToggleGameSettings();//reset brightness
 					m_banner.ToggleZoom();//de zoom to small
 				}
-				m_setMainBg = true;
 				_showGame();
 				if(m_newGame)
 					startGameSound = -10;
@@ -655,7 +648,6 @@ void CMenu::_game(bool launch)
 				{
 					error(_t("errgame19", L"Can't launch in Wii virtual console mode!"));
 					launch = false;
-					m_setMainBg = true;
 					_showGame();
 				}
 				else