diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp
index b58dcc58dc..13ca37652f 100644
--- a/stepmania/src/NoteSkinManager.cpp
+++ b/stepmania/src/NoteSkinManager.cpp
@@ -206,7 +206,9 @@ try_again:
 	CString sPath;	// fill this in below
 	FOREACHD_CONST( CString, data.vsDirSearchOrder, iter )
 	{
-		if( *iter == GLOBAL_BASE_NOTESKIN_DIR )
+		if( sButtonName.empty() )
+			sPath = GetPathFromDirAndFile( *iter, sElement );
+		else if( *iter == GLOBAL_BASE_NOTESKIN_DIR )
 			sPath = GetPathFromDirAndFile( *iter, "Fallback "+sElement );
 		else
 			sPath = GetPathFromDirAndFile( *iter, sButtonName+" "+sElement );