diff --git a/out/boot.dol b/out/boot.dol
index eda662eb..ab92ecb9 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index 7358f1c9..760fcb16 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -62,6 +62,7 @@ class CMenu
 	bool m_newGame;
 	bool show_mem;
 	bool cacheCovers;
+	bool CFLocked;
 	vector<dir_discHdr> m_gameList;
 
 	struct SZone
diff --git a/source/menu/menu_config7.cpp b/source/menu/menu_config7.cpp
index c698a018..753b1f15 100644
--- a/source/menu/menu_config7.cpp
+++ b/source/menu/menu_config7.cpp
@@ -72,6 +72,8 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.show(m_config7Btn1);
 		m_btnMgr.show(m_config7Lbl2);
 		m_btnMgr.show(m_config7Btn2);
+		m_btnMgr.show(m_config7Lbl3);
+		m_btnMgr.show(m_config7Btn3);
 	}
 	else
 	{
@@ -154,6 +156,8 @@ void CMenu::_showConfig7(int curPage)
 		m_btnMgr.setText(m_config7Btn1, _t("cfg14", L"Set"));
 		m_btnMgr.setText(m_config7Lbl2, _t("cfg723", L"Source menu settings"));
 		m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
+		m_btnMgr.setText(m_config7Lbl3, _t("cfg724", L"Lock coverflow layouts"));
+		m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("general", "cf_locked") ?  _t("yes", L"Yes") : _t("no", L"No"));
 	}
 }
 
@@ -316,6 +320,13 @@ int CMenu::_config7(int curPage)
 					_CfgSrc();
 					_showConfig7(12);
 				}
+				else if(m_btnMgr.selected(m_config7Btn3))
+				{
+					bool val = !m_cfg.getBool("general", "cf_locked");
+					m_cfg.setBool("general", "cf_locked", val);
+					m_btnMgr.setText(m_config7Btn3, val ?  _t("yes", L"Yes") : _t("no", L"No"));
+					CFLocked = val;
+				}
 			}
 		}
 	}
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 4fe3cbc9..ecf0c494 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -573,7 +573,7 @@ void CMenu::_game(bool launch)
 				_startVideo();
 		}
 		/* switch coverflow layout */
-		else if((BTN_1_PRESSED || BTN_2_PRESSED) && !coverFlipped && !m_video_playing)
+		else if((BTN_1_PRESSED || BTN_2_PRESSED) && !CFLocked && !coverFlipped && !m_video_playing)
 		{
 			u32 curPos = CoverFlow._currentPos();
 			s8 direction = BTN_1_PRESSED ? 1 : -1;
diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index 281cb66c..80ecd35f 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -289,6 +289,7 @@ int CMenu::main(void)
 	bool bUsed = false;// bused to indicate that it was actually used for something
 	m_emuSaveNand = false;
 	m_reload = false;
+	CFLocked = m_cfg.getBool("GENERAL", "cf_locked", false);
 	u32 disc_check = 0;
 
 	m_prev_view = 0;
@@ -615,7 +616,7 @@ int CMenu::main(void)
 			}
 				
 			/* change coverflow layout/mode */
-			else if(BTN_1_PRESSED || BTN_2_PRESSED)
+			else if((BTN_1_PRESSED || BTN_2_PRESSED) && !CFLocked)
 			{
 				u32 curPos = CoverFlow._currentPos();
 				s8 direction = BTN_1_PRESSED ? 1 : -1;
diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini
index 30323650..8d6a2a04 100644
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@@ -65,6 +65,7 @@ cfg720=Play GC banner sound
 cfg721=Play GC default sound
 cfg722=Homebrew settings
 cfg723=Source menu settings
+cfg724=Lock coverflow layouts
 cfga2=Install game
 cfga3=Install
 cfga6=Language