diff --git a/stepmania/src/RageUtil_FileDB.cpp b/stepmania/src/RageUtil_FileDB.cpp
index 076512f595..cd8ad6e94c 100644
--- a/stepmania/src/RageUtil_FileDB.cpp
+++ b/stepmania/src/RageUtil_FileDB.cpp
@@ -183,6 +183,10 @@ bool FileSet::IsAFile(const CString &path) const
 /* Given "foo/bar/baz/" or "foo/bar/baz", return "foo/bar/" and "baz". */
 static void SplitPath( CString Path, CString &Dir, CString &Name )
 {
+	/* Strip off any trailing slashes. */
+	if( Path.size() > 0 && Path.Right(1) == SLASH )
+		Path.erase( Path.size()-1 );
+
 	static Regex split("(.*/)([^/]+)");
 	CStringArray match;
 	if(split.Compare(Path, match)) {