diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 9f1bb0704a..69ca4a68c2 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -193,6 +193,7 @@ PrefsManager::PrefsManager() :
 	m_BannerCache		( "BannerCache",		BNCACHE_LOW_RES_PRELOAD ),
 	m_bPalettedBannerCache	( "PalettedBannerCache",	false ),
 	m_bFastLoad		( "FastLoad",			false ),
+	m_bFastLoadAdditionalSongs      ( "FastLoadAdditionalSongs",    false ),
 
 	m_bOnlyDedicatedMenuButtons	( "OnlyDedicatedMenuButtons",	false ),
 	m_bMenuTimer		( "MenuTimer",			true ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index c6d4197806..78d36bbb19 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -72,6 +72,7 @@ public:
 	Preference<BannerCache,int>		m_BannerCache;
 	Preference<bool>	m_bPalettedBannerCache;
 	Preference<bool>	m_bFastLoad;
+	Preference<bool>        m_bFastLoadAdditionalSongs;
 
 	Preference<bool>	m_bOnlyDedicatedMenuButtons;
 	Preference<bool>	m_bMenuTimer;
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index a70ce17bd0..f675fcc66c 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -113,7 +113,12 @@ void SongManager::InitSongsFromDisk( LoadingWindow *ld )
 {
 	RageTimer tm;
 	LoadStepManiaSongDir( SONGS_DIR, ld );
+
+	const bool bOldVal = PREFSMAN->m_bFastLoad;
+	PREFSMAN->m_bFastLoad.Set( PREFSMAN->m_bFastLoadAdditionalSongs );
 	LoadStepManiaSongDir( ADDITIONAL_SONGS_DIR, ld );
+	PREFSMAN->m_bFastLoad.Set( bOldVal );
+
 	LOG->Trace( "Found %d songs in %f seconds.", (int)m_pSongs.size(), tm.GetDeltaTime() );
 }