diff --git a/source/common/filesystem/filesystem.cpp b/source/common/filesystem/filesystem.cpp
index 3e7cdef79..f03a613ef 100644
--- a/source/common/filesystem/filesystem.cpp
+++ b/source/common/filesystem/filesystem.cpp
@@ -1668,3 +1668,20 @@ FResourceLump* FileSystem::GetFileAt(int no)
 	return FileInfo[no].lump;
 }
 
+#include "c_dispatch.h"
+
+CCMD(fs_dir)
+{
+	int numfiles = fileSystem.GetNumEntries();
+
+	for (int i = 0; i < numfiles; i++)
+	{
+		auto container = fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(i));
+		auto fn1 = fileSystem.GetFileFullName(i);
+		auto fns = fileSystem.GetFileShortName(i);
+		auto fnid = fileSystem.GetResourceId(i);
+		auto length = fileSystem.FileLength(i);
+		bool hidden = fileSystem.FindFile(fn1) != i;
+		Printf(PRINT_NONOTIFY, "%s%-64s %-15s (%5d) %10d %s %s\n", hidden? TEXTCOLOR_RED : TEXTCOLOR_UNTRANSLATED, fn1, fns, fnid, length, container, hidden ? "(h)" : "");
+	}
+}
\ No newline at end of file
diff --git a/source/core/raze_music.cpp b/source/core/raze_music.cpp
index a27b4146f..09b010d34 100644
--- a/source/core/raze_music.cpp
+++ b/source/core/raze_music.cpp
@@ -75,15 +75,10 @@ FString G_SetupFilenameBasedMusic(const char* fn, const char* defmusic)
 	FString name = StripExtension(fn);
 	FString test;
 
-	// Test if a real file with this name exists with all known extensions for music.
 	for (auto& ext : knownMusicExts)
 	{
 		test.Format("%s.%s", name.GetChars(), ext);
-		if (FileExists(test)) return test;
-#ifdef __unix__
-		test.Format("%s.%s", name.GetChars(), FString(ext).MakeLower().GetChars());
-		if (FileExists(test)) return test;
-#endif
+		if (fileSystem.FileExists(test)) return test;
 	}
 	return defmusic;
 }