diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index 18f780d0..f9cd32f0 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -100,7 +100,7 @@ start_main:
 				m_btnMgr.show(m_mainBtnChannel);
 			else if(show_emu)
 				m_btnMgr.show(m_mainBtnEmu);
-			else if(show_homebrew)
+			else if(show_homebrew && (parental_homebrew || !m_locked))
 				m_btnMgr.show(m_mainBtnHomebrew);
 			else
 				m_btnMgr.show(m_mainBtnUsb);
@@ -349,7 +349,7 @@ int CMenu::main(void)
 				m_current_view =  COVERFLOW_PLUGIN;
 			else if(BTN_RIGHT_PRESSED && show_channel)
 				m_current_view = COVERFLOW_CHANNEL;
-			if(lastView == m_current_view) 
+			if(lastView == m_current_view && show_homebrew && (parental_homebrew || !m_locked)) 
 				m_current_view = COVERFLOW_HOMEBREW;
 			_clearSources();
 			switch(m_current_view)
@@ -820,7 +820,7 @@ int CMenu::main(void)
 						m_btnMgr.show(m_mainBtnChannel);
 					else if(show_emu)
 						m_btnMgr.show(m_mainBtnEmu);
-					else if(show_homebrew)
+					else if(show_homebrew && (parental_homebrew || !m_locked))
 						m_btnMgr.show(m_mainBtnHomebrew);
 					else 
 						m_btnMgr.show(m_mainBtnUsb);
diff --git a/source/menu/menu_source.cpp b/source/menu/menu_source.cpp
index 1d5b5e90..e11622d8 100644
--- a/source/menu/menu_source.cpp
+++ b/source/menu/menu_source.cpp
@@ -34,6 +34,7 @@ s16 m_sourceBtnHomebrew;
 
 TexData m_sourceBg;
 
+bool exitSource = false;
 u8 sourceBtn;
 u8 selectedBtns;
 int source_curPage;
@@ -188,6 +189,7 @@ void CMenu::_showSourceNotice(void)
 {
 	m_showtimer = 90;
 	m_btnMgr.show(m_sourceLblNotice);
+	exitSource = false;
 }
 
 dir_discHdr sourceList;
@@ -352,7 +354,7 @@ bool CMenu::_Source()
 	bool parental_homebrew = m_cfg.getBool(HOMEBREW_DOMAIN, "parental", false);	
 	bool noChanges = true;
 	bool updateSource = false;
-	bool exitSource = false;
+	exitSource = false;
 	u8 numPlugins = 0;
 	m_showtimer = 0;
 	source_curPage = 1;