diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index d3c66ea3..9361c7ab 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -2196,38 +2196,39 @@ bool CMenu::_loadList(void)
 	u8 sources = 0;
 	gprintf("Creating Gamelist\n");
 
-	if(m_cfg.getBool(PLUGIN_DOMAIN, "source",false))
+	if((m_current_view == COVERFLOW_USB && !m_cfg.has(WII_DOMAIN, "source")) || 
+			m_cfg.getBool(WII_DOMAIN, "source"))
 	{
-		_loadEmuList();
-		m_current_view = COVERFLOW_PLUGIN;
-		sources++;
-	}
-	
-	if(m_cfg.getBool(WII_DOMAIN, "source",false))
-	{
-		_loadGameList();
 		m_current_view = COVERFLOW_USB;
+		_loadGameList();
 		sources++;
 	}
-	
-	if(m_cfg.getBool(CHANNEL_DOMAIN, "source",false))
+	if((m_current_view == COVERFLOW_PLUGIN && !m_cfg.has(PLUGIN_DOMAIN, "source")) || 
+		m_cfg.getBool(PLUGIN_DOMAIN, "source"))
+	{
+		m_current_view = COVERFLOW_PLUGIN;
+		_loadEmuList();
+		sources++;
+	}
+	if((m_current_view == COVERFLOW_CHANNEL && !m_cfg.has(CHANNEL_DOMAIN, "source")) || 
+			m_cfg.getBool(CHANNEL_DOMAIN, "source"))
 	{
 		m_current_view = COVERFLOW_CHANNEL;
 		_loadChannelList();
 		sources++;
 	}
-
-	if(m_cfg.getBool(GC_DOMAIN, "source",false))
+	if((m_current_view == COVERFLOW_DML && !m_cfg.has(GC_DOMAIN, "source")) || 
+			m_cfg.getBool(GC_DOMAIN, "source"))
 	{
-		_loadDmlList();
 		m_current_view = COVERFLOW_DML;
+		_loadDmlList();
 		sources++;
 	}
-
-	if(m_cfg.getBool(HOMEBREW_DOMAIN, "source",false))
+	if((m_current_view == COVERFLOW_HOMEBREW && !m_cfg.has(HOMEBREW_DOMAIN, "source")) || 
+			m_cfg.getBool(HOMEBREW_DOMAIN, "source"))
 	{
-		_loadHomebrewList();
 		m_current_view = COVERFLOW_HOMEBREW;
+		_loadHomebrewList();
 		sources++;
 	}
 	if(sources > 1)