diff --git a/src/Song.cpp b/src/Song.cpp
index 53214d23e1..a3f07b3ad0 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -588,8 +588,11 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 	// is the CDTitle.
 
 	CHECKPOINT_M( "Looking for images..." );
-    
-    if( !duringCache )
+	// HACK: DWI files require searching the file system for this info.
+    RString extension = GetExtension(this->m_sSongFileName);
+	extension.MakeLower();
+	
+    if( extension == "dwi" || !duringCache )
     {
 
         // First, check the file name for hints.
@@ -804,7 +807,7 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 
 	// If no BGChanges are specified and there are movies in the song directory, then assume
 	// they are DWI style where the movie begins at beat 0.
-	if( !HasBGChanges() && !duringCache )
+	if( extension == "dwi" || (!HasBGChanges() && !duringCache) )
 	{
 		vector<RString> arrayPossibleMovies;
 		GetDirListing( m_sSongDir + RString("*.ogv"), arrayPossibleMovies );